diff --git a/History.txt b/History.txt
deleted file mode 100644
index 00e03519b..000000000
--- a/History.txt
+++ /dev/null
@@ -1,288 +0,0 @@
-Changelog
-===============================================================================
-
-v0.8 (combines changes from 0.7.6 that weren't released as an actual build
-      outside of the github repo)
-    - Support for AMD, and general reliance on the module pattern.
-      An assembly maps to a module (named by its ScriptAssembly attribute).
-      Its references map to dependencies. The ssloader.js provides a
-      small/compact loader that supports declarative configuration, local
-      storage integration, auto/pre-loading of scripts and the core
-      AMD constructs - define and require.
-    - Script generation optimizations leveraging module patterns, more
-      efficient constructs (eg. anonymous method generation, locally scoped
-      functions for type definitions etc.), smaller minimized identifiers in
-      some cases
-    - Optimize mscorlib.js (now renamed ss.js) in terms of size, more
-      streamlined type system, as well as removal of all global extensions
-      to existing script objects.
-    - Removed .debug and .release generated scripts. Debug build produces
-      Foo.js and minimized Foo.min.js (of the debug flavor), and release
-      build also produces Foo.js and corresponding minimized Foo.min.js.
-    - Leverage AjaxMin tool to perform minimization (better minimization
-      as a result)
-    - NodeJS support
-    - Removed metadata attributes
-      . ScriptNamespaceAttribute
-      . AlternateSignatureAttribute is gone ... just extern suffices
-      . ScriptQualifier
-    - Replace/renamed metadata attributes
-      . PreserveCase is now a property on ScriptName
-      . PreserveName is now a property on ScriptName
-      . Imported is now ScriptImport
-      . IgnoreNamespace is now ScriptIgnoreNamespace
-      . IntrinsicProperty in now ScriptField (was temporarily ScriptProperty)
-      . Resources is now ScriptResources
-      . NamedValues and NumericValues combined into ScriptConstants
-      . GlobalMethods is gone, and Mixin replaced with ScriptExtension
-      . NonScriptable is now ScriptIgnore
-    - New metadata attributes
-      . ScriptTemplate (to provide a template for script generation
-        instead of a template file within the project)
-      . ScriptModule
-      . ScriptMethod
-      . ScriptEvent
-      . ScriptDependency
-    - Removed Record base class. Use ScriptObject attribute instead.
-    - Runtime
-      . Added Stack/Queue implementations
-      . Various changes in mscorlib classes
-        Removed:
-        Array.Clone, Index, GroupBy
-        Format and LocaleFormat methods on numeric types (use String.Format)
-        Date.Empty, IsEmpty (use null)
-        Delegate.ClearExport, DeleteExport (use Detach/Dispose on new Export object)
-        String.CompareTo, Equals (use String.Compare)
-        String.HtmlEncode/Decode, IndexOfAny, LastIndexOfAny
-
-        Replaced:
-        Array.Extract -> GetRange
-        Delegate.CreateExport -> Export (returns Export object instead of string)
-        String.LocaleFormat -> use overload that takes in CultureInfo
-
-        Added:
-        Script.Global, Undefined
-        Script.Require
-    - MSBuild changes:
-      . Added support for a CrunchScripts property in your csproj to control
-        whether crunching happens for the .min.js script is produced.
-      . Added support for a ScriptDocumentation property in your csproj to
-        control whether doc-comments are added to generated scripts (replaces
-        old SuppressDocumentation property)
-      . Removed generation of doc-comments into script
-    - Misc metadata changes
-      . Knockout - Rename DependentObservable<T> -> ComputedObservable<T> to
-                   match Knockout API changes
-      . jQuery - Added Unique
-      . Rename RegularExpression to RegExp (to match shorter script name)
-    - Bug fixes
-      [git #223] Special case generation of date equality checks to make
-                 them work as expected
-
-
-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/Readme.md b/Readme.md
index 3140c065d..72f0fcfd5 100644
--- a/Readme.md
+++ b/Readme.md
@@ -1,6 +1,6 @@
 # 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.
+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, node.js 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".
 
@@ -23,8 +23,9 @@ The [Script# Wiki](https://github.com/nikhilk/scriptsharp/wiki/Wiki) contains th
 
 * [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
+* [Building, installing and testing](https://github.com/nikhilk/scriptsharp/wiki/Building,-Installing-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)
+* [Release notes](https://github.com/nikhilk/scriptsharp/wiki/Release-Notes) for a changelog and any version to version migration details.
 
 ### Credits ###
 
diff --git a/fx/Sharpen/Core/Core.csproj b/fx/Sharpen/Core/Core.csproj
index 8821e2983..f3a597658 100644
--- a/fx/Sharpen/Core/Core.csproj
+++ b/fx/Sharpen/Core/Core.csproj
@@ -14,7 +14,6 @@
     <GenerateScript>True</GenerateScript>
     <GenerateResources>True</GenerateResources>
     <MinimizeScript>True</MinimizeScript>
-    <CrunchScript>True</CrunchScript>
     <CopyReferences>True</CopyReferences>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/samples/AroundMe/AroundMe/AroundMe.csproj b/samples/AroundMe/AroundMe/AroundMe.csproj
index 63bc2ee8d..2566f91a7 100644
--- a/samples/AroundMe/AroundMe/AroundMe.csproj
+++ b/samples/AroundMe/AroundMe/AroundMe.csproj
@@ -15,9 +15,7 @@
     <GenerateScript>True</GenerateScript>
     <GenerateResources>True</GenerateResources>
     <RestoreNugetPackages>true</RestoreNugetPackages>
-    <DeploymentPath>..\AroundMeWeb\Scripts</DeploymentPath>
     <MinimizeScript>True</MinimizeScript>
-    <CrunchScript>True</CrunchScript>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>bin\Debug\</OutputPath>
diff --git a/samples/AroundMe/AroundMeWeb/AroundMeWeb.csproj b/samples/AroundMe/AroundMeWeb/AroundMeWeb.csproj
index 090a954b8..eba29ac4d 100644
--- a/samples/AroundMe/AroundMeWeb/AroundMeWeb.csproj
+++ b/samples/AroundMe/AroundMeWeb/AroundMeWeb.csproj
@@ -19,6 +19,7 @@
     <IISExpressAnonymousAuthentication />
     <IISExpressWindowsAuthentication />
     <IISExpressUseClassicPipelineMode />
+    <RestoreNugetPackages>true</RestoreNugetPackages>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -92,11 +93,16 @@
     <Content Include="Scripts\ss.min.js" />
     <Content Include="Scripts\ssloader.js" />
     <Content Include="Scripts\ssloader.min.js" />
-    <Content Include="Scripts\VE.js" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\AroundMe\AroundMe.csproj">
+      <Project>{c1aff814-2c3a-4d04-88a4-5cf10d07aa56}</Project>
+      <Name>AroundMe</Name>
+    </ProjectReference>
+  </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
@@ -122,6 +128,8 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
+  <Import Project="..\packages\nuget.targets" />
+  <Import Project="..\packages\ScriptSharp.Runtime.0.8\tools\ScriptSharpWeb.targets" Condition="Exists('..\packages\ScriptSharp.Runtime.0.8\tools\ScriptSharpWeb.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">
diff --git a/samples/AroundMe/AroundMeWeb/Default.htm b/samples/AroundMe/AroundMeWeb/Default.htm
index 84f04102a..808a07fea 100644
--- a/samples/AroundMe/AroundMeWeb/Default.htm
+++ b/samples/AroundMe/AroundMeWeb/Default.htm
@@ -34,7 +34,7 @@
     </div>
   </div>
 
-  <script type="text/script" data-name="vemaps" data-src="/Scripts/VE.js"
+  <script type="text/script" data-name="vemaps" data-src="http://ecn.dev.virtualearth.net/mapcontrol/mapcontrol.ashx?v=7.0&onScriptLoad=callbackScript"
     data-export="Microsoft.Maps" data-autoload="true"></script>
   <script type="text/script" data-name="twttr" data-src="http://platform.twitter.com/anywhere.js?id=BDvnYA8jh6osbRb83Ybw&v=1"
     data-export="window.twttr" data-autoload="true"></script>
diff --git a/samples/AroundMe/Twitter/Twitter.cs b/samples/AroundMe/Twitter/Twitter.cs
index 9b645202a..664bced9c 100644
--- a/samples/AroundMe/Twitter/Twitter.cs
+++ b/samples/AroundMe/Twitter/Twitter.cs
@@ -30,44 +30,44 @@ public TweetBoxOptions() {
         public TweetBoxOptions(params object[] nameValuePairs) {
         }
 
-        [ScriptProperty]
+        [ScriptField]
         public bool Counter {
             get;
             set;
         }
 
-        [ScriptProperty]
+        [ScriptField]
         public TweetBoxData Data {
             get;
             set;
         }
 
-        [ScriptProperty]
+        [ScriptField]
         public string DefaultContent {
             get;
             set;
         }
 
-        [ScriptProperty]
+        [ScriptField]
         public int Height {
             get;
             set;
         }
 
-        [ScriptProperty]
+        [ScriptField]
         public string Label {
             get;
             set;
         }
 
         [ScriptName("onTweet")]
-        [ScriptProperty]
+        [ScriptField]
         public TweetCallback Callback {
             get;
             set;
         }
 
-        [ScriptProperty]
+        [ScriptField]
         public int Width {
             get;
             set;
@@ -86,14 +86,14 @@ public TweetBoxData(params object[] nameValuePairs) {
         }
 
         [ScriptName("lat")]
-        [ScriptProperty]
+        [ScriptField]
         public double Latitude {
             get;
             set;
         }
 
         [ScriptName("lon")]
-        [ScriptProperty]
+        [ScriptField]
         public double Longitude {
             get;
             set;
diff --git a/samples/Cellar/Cellar.sln b/samples/Cellar/Cellar.sln
new file mode 100644
index 000000000..b29f739b5
--- /dev/null
+++ b/samples/Cellar/Cellar.sln
@@ -0,0 +1,29 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CellarServer", "CellarServer\CellarServer.csproj", "{C58080FF-3DFB-4EBC-A05F-B35EEB686E33}"
+	ProjectSection(ProjectDependencies) = postProject
+		{E32153A0-364C-418F-B409-287B764E2875} = {E32153A0-364C-418F-B409-287B764E2875}
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CellarClient", "CellarClient\CellarClient.csproj", "{E32153A0-364C-418F-B409-287B764E2875}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{C58080FF-3DFB-4EBC-A05F-B35EEB686E33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C58080FF-3DFB-4EBC-A05F-B35EEB686E33}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C58080FF-3DFB-4EBC-A05F-B35EEB686E33}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C58080FF-3DFB-4EBC-A05F-B35EEB686E33}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E32153A0-364C-418F-B409-287B764E2875}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E32153A0-364C-418F-B409-287B764E2875}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E32153A0-364C-418F-B409-287B764E2875}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E32153A0-364C-418F-B409-287B764E2875}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/samples/Cellar/CellarClient/CellarApplication.cs b/samples/Cellar/CellarClient/CellarApplication.cs
new file mode 100644
index 000000000..976e5f76f
--- /dev/null
+++ b/samples/Cellar/CellarClient/CellarApplication.cs
@@ -0,0 +1,106 @@
+// CellarApplication.cs
+//
+
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Serialization;
+using Cellar.DataModels;
+using KnockoutApi;
+
+namespace Cellar {
+
+    public sealed class CellarApplication {
+
+        private const int WinesPerPage = 8;
+
+        private readonly Observable<int> _pageIndex;
+        private readonly Observable<int> _pages;
+
+        public readonly ComputedObservable<bool> CanGoPrevious;
+        public readonly ComputedObservable<bool> CanGoNext;
+        public readonly Observable<IEnumerable<Wine>> Wines;
+        public readonly Observable<Wine> SelectedWine;
+        public readonly ComputedObservable<bool> ShowSelection;
+
+        public readonly Action Next;
+        public readonly Action Previous;
+        public readonly Action<Wine> Select;
+
+        public CellarApplication() {
+            _pages = Knockout.Observable<int>(0);
+            _pageIndex = Knockout.Observable<int>(0);
+
+            Wines = Knockout.Observable<IEnumerable<Wine>>();
+            SelectedWine = Knockout.Observable<Wine>();
+            CanGoPrevious = Knockout.Computed<bool>(ComputeCanGoPrevious);
+            CanGoNext = Knockout.Computed<bool>(ComputeCanGoNext);
+            ShowSelection = Knockout.Computed<bool>(ComputeShowSelection);
+
+            Next = delegate() {
+                NextCommand();
+            };
+            Previous = delegate() {
+                PreviousCommand();
+            };
+            Select = delegate(Wine wine) {
+                SelectCommand(wine);
+            };
+
+            LoadWines();
+        }
+
+        private bool ComputeCanGoNext() {
+            return _pageIndex.GetValue() < (_pages.GetValue() - 1);
+        }
+
+        private bool ComputeCanGoPrevious() {
+            return _pageIndex.GetValue() > 0;
+        }
+
+        private bool ComputeShowSelection() {
+            return SelectedWine.GetValue() != null;
+        }
+
+        private void LoadWines() {
+            int skip = _pageIndex.GetValue() * WinesPerPage;
+
+            XmlHttpRequest xhr = new XmlHttpRequest();
+            xhr.OnReadyStateChange = delegate() {
+                if ((xhr.ReadyState == ReadyState.Loaded) &&
+                    (xhr.Status == 200)) {
+                    WineResults results = Json.ParseData<WineResults>(xhr.ResponseText);
+
+                    if (results.Count != 0) {
+                        _pages.SetValue(Math.Ceil(results.Count / WinesPerPage));
+                    }
+
+                    Wines.SetValue(results.Wines);
+
+                    Wine selectedWine = null;
+                    if ((results.Wines != null) && (results.Wines.Length != 0)) {
+                        selectedWine = results.Wines[0];
+                    }
+                    SelectedWine.SetValue(selectedWine);
+                }
+            };
+
+            xhr.Open(HttpVerb.Get, "/wines/?skip=" + skip + "&count=" + WinesPerPage, true);
+            xhr.Send();
+        }
+
+        private void PreviousCommand() {
+            _pageIndex.SetValue(_pageIndex.GetValue() - 1);
+            LoadWines();
+        }
+
+        private void NextCommand() {
+            _pageIndex.SetValue(_pageIndex.GetValue() + 1);
+            LoadWines();
+        }
+
+        private void SelectCommand(Wine wine) {
+            SelectedWine.SetValue(wine);
+        }
+    }
+}
diff --git a/samples/Cellar/CellarClient/CellarClient.csproj b/samples/Cellar/CellarClient/CellarClient.csproj
new file mode 100644
index 000000000..6fe72fa2a
--- /dev/null
+++ b/samples/Cellar/CellarClient/CellarClient.csproj
@@ -0,0 +1,56 @@
+<?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>{E32153A0-364C-418F-B409-287B764E2875}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Cellar</RootNamespace>
+    <AssemblyName>cellar</AssemblyName>
+    <CodeAnalysisRuleSet>Properties\FxCop.ruleset</CodeAnalysisRuleSet>
+    <GenerateScript>True</GenerateScript>
+    <GenerateResources>True</GenerateResources>
+    <MinimizeScript>True</MinimizeScript>
+    <CopyReferences>True</CopyReferences>
+    <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\cellar.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\cellar.xml</DocumentationFile>
+  </PropertyGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+    <None Include="Properties\FxCop.ruleset" />
+    <Compile Include="CellarApplication.cs" />
+    <Compile Include="DataModels\Wine.cs" />
+    <Compile Include="DataModels\WineResults.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Page.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Script.Knockout">
+      <HintPath>..\packages\ScriptSharp.Lib.Knockout.0.8\lib\Script.Knockout.dll</HintPath>
+    </Reference>
+    <Reference Include="Script.Web">
+      <HintPath>..\packages\ScriptSharp.Lib.HTML.0.8\lib\Script.Web.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\packages\ScriptSharp.0.8\tools\ScriptSharp.targets" Condition="Exists('..\packages\ScriptSharp.0.8\tools\ScriptSharp.targets')" />
+  <Import Project="..\packages\nuget.targets" />
+</Project>
\ No newline at end of file
diff --git a/samples/Cellar/CellarClient/DataModels/Wine.cs b/samples/Cellar/CellarClient/DataModels/Wine.cs
new file mode 100644
index 000000000..623259fd8
--- /dev/null
+++ b/samples/Cellar/CellarClient/DataModels/Wine.cs
@@ -0,0 +1,22 @@
+// Wine.cs
+//
+
+using System;
+using System.Collections.Generic;
+
+namespace Cellar.DataModels {
+
+    [ScriptObject]
+    public sealed class Wine {
+
+        [ScriptName("_id")]
+        public int ID;
+        public string Name;
+        public int Year;
+        public string Grapes;
+        public string Country;
+        public string Region;
+        public string Description;
+        public string Image;
+    }
+}
diff --git a/samples/Cellar/CellarClient/DataModels/WineResults.cs b/samples/Cellar/CellarClient/DataModels/WineResults.cs
new file mode 100644
index 000000000..7298c5eb3
--- /dev/null
+++ b/samples/Cellar/CellarClient/DataModels/WineResults.cs
@@ -0,0 +1,16 @@
+// WineResults.cs
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace Cellar.DataModels {
+
+    [ScriptImport]
+    [ScriptObject]
+    public sealed class WineResults {
+
+        public int Count;
+        public Wine[] Wines;
+    }
+}
diff --git a/samples/Cellar/CellarClient/Page.cs b/samples/Cellar/CellarClient/Page.cs
new file mode 100644
index 000000000..9ec277527
--- /dev/null
+++ b/samples/Cellar/CellarClient/Page.cs
@@ -0,0 +1,14 @@
+// Page.cs
+//
+
+using System;
+using KnockoutApi;
+using Cellar;
+
+[ScriptModule]
+internal static class Page {
+
+    static Page() {
+        Knockout.ApplyBindings(new CellarApplication());
+    }
+}
diff --git a/samples/Cellar/CellarClient/Properties/AssemblyInfo.cs b/samples/Cellar/CellarClient/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..d4db5084b
--- /dev/null
+++ b/samples/Cellar/CellarClient/Properties/AssemblyInfo.cs
@@ -0,0 +1,39 @@
+// 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("Cellar")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Cellar Sample for Script#")]
+[assembly: AssemblyCopyright("Copyright © 2013")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
+
+[assembly: ScriptAssembly("cellar")]
+[assembly: ScriptReference("knockout", Path="knockout-2.1.0")]
+
+// A script template using an AMD pattern for declaring dependencies consumed
+// by the generated script.
+[assembly: ScriptTemplate(@"
+/*! {name}.js {version}
+ * {description}
+ */
+
+""use strict"";
+
+require([{requires}], function({dependencies}) {
+  var $global = this;
+
+  {script}
+});
+")]
diff --git a/samples/Cellar/CellarClient/Properties/FxCop.ruleset b/samples/Cellar/CellarClient/Properties/FxCop.ruleset
new file mode 100644
index 000000000..47c160f61
--- /dev/null
+++ b/samples/Cellar/CellarClient/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/Cellar/CellarClient/packages.config b/samples/Cellar/CellarClient/packages.config
new file mode 100644
index 000000000..cf5db3f97
--- /dev/null
+++ b/samples/Cellar/CellarClient/packages.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="ScriptSharp" version="0.8" targetFramework="net40" />
+  <package id="ScriptSharp.Lib.HTML" version="0.8" targetFramework="net40" />
+  <package id="ScriptSharp.Lib.Knockout" version="0.8" targetFramework="net40" />
+</packages>
\ No newline at end of file
diff --git a/samples/Cellar/CellarServer/CellarApplication.cs b/samples/Cellar/CellarServer/CellarApplication.cs
new file mode 100644
index 000000000..cd31db2d2
--- /dev/null
+++ b/samples/Cellar/CellarServer/CellarApplication.cs
@@ -0,0 +1,67 @@
+// CellarApplication.cs
+//
+
+using System;
+using System.Diagnostics;
+using System.Serialization;
+using System.Threading;
+using NodeApi.IO;
+using NodeApi.Network;
+using Cellar.Controllers;
+using Cellar.DataModels;
+using Cellar.Services;
+using Cellar.Services.MongoLab;
+
+namespace Cellar {
+
+    internal sealed class CellarApplication {
+
+        private IWineRepository _repository;
+
+        public WinesController CreateWinesController() {
+            return new WinesController(_repository);
+        }
+
+        public void Initialize(string dbUrl, Action<Exception> callback) {
+            UrlData urlData = Url.Parse(dbUrl);
+            string[] credentials = urlData.Auth.Split(':');
+
+            MongoWineRepository.Create(urlData.HostName, Number.ParseInt(urlData.Port, 10),
+                                       urlData.Path.Substr(1),
+                                       credentials[0], credentials[1])
+                .Done(delegate(MongoWineRepository repository) {
+                    _repository = repository;
+                    _repository.CountWines()
+                        .ContinueWith(delegate(Task<int> countTask) {
+                            if ((countTask.Error != null) ||
+                                (countTask.Result == 0)) {
+                                PopulateRepository(callback);
+                            }
+                            else {
+                                Debug.WriteLine("Repository initialized (and already populated).");
+                                callback(null);
+                            }
+                        });
+                })
+                .Fail(delegate(Exception error) {
+                    callback(new Exception("Unable to create repository."));
+                });
+        }
+
+        private void PopulateRepository(Action<Exception> callback) {
+            Debug.WriteLine("Populating repository...");
+
+            string data = FileSystem.ReadFileTextSync("data.json", Encoding.UTF8);
+            Wine[] wines = Json.ParseData<Wine[]>(data);
+
+            _repository.InsertWines(wines)
+                .Done(delegate() {
+                    Debug.WriteLine("Repository populated.");
+                    callback(null);
+                })
+                .Fail(delegate(Exception error) {
+                    callback(new Exception("Could not populate repository."));
+                });
+        }
+    }
+}
diff --git a/samples/Cellar/CellarServer/CellarServer.csproj b/samples/Cellar/CellarServer/CellarServer.csproj
new file mode 100644
index 000000000..fa484946a
--- /dev/null
+++ b/samples/Cellar/CellarServer/CellarServer.csproj
@@ -0,0 +1,189 @@
+<?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>{C58080FF-3DFB-4EBC-A05F-B35EEB686E33}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Cellar</RootNamespace>
+    <AssemblyName>Cellar.Server</AssemblyName>
+    <ScriptName>cellar</ScriptName>
+    <CodeAnalysisRuleSet>Properties\FxCop.ruleset</CodeAnalysisRuleSet>
+    <GenerateScript>True</GenerateScript>
+    <GenerateResources>True</GenerateResources>
+    <MinimizeScript>False</MinimizeScript>
+    <CopyReferences>True</CopyReferences>
+    <CopyReferencesPath>node_modules</CopyReferencesPath>
+    <RestoreNugetPackages>true</RestoreNugetPackages>
+    <ScriptsPath>Content\Scripts</ScriptsPath>
+  </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>
+  </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>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="CellarApplication.cs" />
+    <Compile Include="Controllers\WinesController.cs" />
+    <Compile Include="DataModels\Wine.cs" />
+    <Compile Include="Services\IWineRepository.cs" />
+    <Compile Include="Services\MongoLab\MongoWineRepository.cs" />
+    <Content Include="..\CellarClient\bin\$(Configuration)\cellar.js">
+      <Link>Content\scripts\cellar.js</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\CellarClient\bin\$(Configuration)\cellar.min.js">
+      <Link>Content\scripts\cellar.min.js</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\CellarClient\bin\$(Configuration)\ss.js">
+      <Link>Content\scripts\ss.js</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\CellarClient\bin\$(Configuration)\ss.min.js">
+      <Link>Content\scripts\ss.min.js</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\cellar.html">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\images\bg.jpg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\images\github.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\images\wine.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\index.html">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\scripts\jquery-1.4.4.min.js">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\scripts\jquery.reveal.js">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\scripts\knockout-2.1.0.js">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\scripts\require.min.js">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\site.css">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\wines\argiano.jpg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\wines\block_nine.jpg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\wines\bodega_lurton.jpg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\wines\bouscat.jpg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\wines\calera.jpg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\wines\caronne.jpg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\wines\dinastia.jpg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\wines\domaine_serene.jpg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\wines\ex_umbris.jpg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\wines\fourvines.jpg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\wines\hugel.jpg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\wines\lan_rioja.jpg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\wines\le_doyenne.jpg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\wines\margerum.jpg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\wines\momo.jpg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\wines\morizottes.jpg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\wines\petalos.jpg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\wines\ponzi.jpg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\wines\quivira.jpg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\wines\rex_hill.jpg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\wines\saint_cosme.jpg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\wines\shafer.jpg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\wines\viticcio.jpg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\wines\waterbrook.jpg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="package.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <None Include="packages.config" />
+    <None Include="Properties\FxCop.ruleset" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Server.cs" />
+    <Content Include="data.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Script.Node">
+      <HintPath>..\packages\ScriptSharp.Lib.Node.0.8\lib\Script.Node.dll</HintPath>
+    </Reference>
+    <Reference Include="Script.Node.Express, Version=0.8.0.0, Culture=neutral, PublicKeyToken=8fc0e3af5abcb6c4, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\ScriptSharp.Lib.Node.Express.0.8\lib\Script.Node.Express.dll</HintPath>
+    </Reference>
+    <Reference Include="Script.Node.Mongo, Version=0.8.0.0, Culture=neutral, PublicKeyToken=8fc0e3af5abcb6c4, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\ScriptSharp.Lib.Node.Mongo.0.8\lib\Script.Node.Mongo.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\packages\ScriptSharp.0.8\tools\ScriptSharp.targets" Condition="Exists('..\packages\ScriptSharp.0.8\tools\ScriptSharp.targets')" />
+  <Import Project="..\packages\nuget.targets" />
+  <Import Project="..\packages\ScriptSharp.Runtime.0.8\tools\ScriptSharpWeb.targets" Condition="Exists('..\packages\ScriptSharp.Runtime.0.8\tools\ScriptSharpWeb.targets')" />
+</Project>
\ No newline at end of file
diff --git a/samples/Cellar/CellarServer/Content/cellar.html b/samples/Cellar/CellarServer/Content/cellar.html
new file mode 100644
index 000000000..bf0e18844
--- /dev/null
+++ b/samples/Cellar/CellarServer/Content/cellar.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html lang="en" xmlns="http://www.w3.org/1999/xhtml">
+<head>
+  <title>Wines in the Cellar</title>
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <link type="text/css" rel="stylesheet" href="site.css" />
+</head>
+<body class="cellar">
+  <header>
+    <div>
+      <h1><a href="/">Cellar</a></h1>
+    </div>
+  </header>
+  <section class="main">
+    <ul id="wineList" data-bind="foreach: wines">
+      <li>
+        <a href="#" data-bind="click: $parent.select"
+          data-reveal-id="wineDetail" data-animation="fade">
+          <img data-bind="attr: { src: 'wines/' + image, title: name }" />
+        </a>
+      </li>
+    </ul>
+    <div id="wineDetail" data-bind="with: selectedWine"
+      class="reveal-modal close-reveal-modal">
+      <h2 data-bind="text: name"></h2>
+      <img title="bottle image" data-bind="attr: { src: 'wines/' + image }" />
+      <h3 data-bind="text: grapes + ' grapes'"></h3>
+      <h3 data-bind="text: region + ', ' + country"></h3>
+      <p>
+        <label data-bind="text: description" />
+      </p>
+      <a class="close-reveal-modal">&#215;</a>
+    </div>
+  </section>
+  <footer>
+    <button href="#" data-bind="enable: canGoPrevious, click: previous">Previous</button>
+    <button href="#" data-bind="enable: canGoNext, click: next">Next</button>
+  </footer>
+  <script src="scripts/jquery-1.4.4.min.js"></script>
+  <script src="scripts/jquery.reveal.js"></script>
+  <script src="scripts/require.min.js" data-main="scripts/cellar"></script>
+</body>
+</html>
diff --git a/samples/Cellar/CellarServer/Content/images/bg.jpg b/samples/Cellar/CellarServer/Content/images/bg.jpg
new file mode 100644
index 000000000..5ba169b08
Binary files /dev/null and b/samples/Cellar/CellarServer/Content/images/bg.jpg differ
diff --git a/samples/Cellar/CellarServer/Content/images/github.png b/samples/Cellar/CellarServer/Content/images/github.png
new file mode 100644
index 000000000..9194d80c4
Binary files /dev/null and b/samples/Cellar/CellarServer/Content/images/github.png differ
diff --git a/samples/Cellar/CellarServer/Content/images/wine.png b/samples/Cellar/CellarServer/Content/images/wine.png
new file mode 100644
index 000000000..d0ab24783
Binary files /dev/null and b/samples/Cellar/CellarServer/Content/images/wine.png differ
diff --git a/samples/Cellar/CellarServer/Content/index.html b/samples/Cellar/CellarServer/Content/index.html
new file mode 100644
index 000000000..fb04c6d87
--- /dev/null
+++ b/samples/Cellar/CellarServer/Content/index.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html lang="en" xmlns="http://www.w3.org/1999/xhtml">
+<head>
+  <title>Cellar</title>
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <link type="text/css" rel="stylesheet" href="site.css" />
+</head>
+<body class="home">
+  <div id="banner">
+    <h1>Cellar</h1>
+    <h2>Sample application built using Node.js, Express, MongoDB, Knockout and Script#</h2>
+  </div>
+  <div id="commands">
+    <a href="cellar.html"><img src="images/wine.png" />Browse Wine Cellar</a>
+    <a href="https://github.com/nikhilk/scriptsharp" target="_blank"><img src="images/github.png" />Script# on Github</a>
+  </div>
+</body>
+</html>
diff --git a/samples/Cellar/CellarServer/Content/scripts/jquery-1.4.4.min.js b/samples/Cellar/CellarServer/Content/scripts/jquery-1.4.4.min.js
new file mode 100644
index 000000000..2bd4cbb8a
--- /dev/null
+++ b/samples/Cellar/CellarServer/Content/scripts/jquery-1.4.4.min.js
@@ -0,0 +1,167 @@
+/*!
+ * jQuery JavaScript Library v1.4.4
+ * http://jquery.com/
+ *
+ * Copyright 2010, John Resig
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * Includes Sizzle.js
+ * http://sizzlejs.com/
+ * Copyright 2010, The Dojo Foundation
+ * Released under the MIT, BSD, and GPL Licenses.
+ *
+ * Date: Thu Nov 11 19:04:53 2010 -0500
+ */
+(function(E,B){function ka(a,b,d){if(d===B&&a.nodeType===1){d=a.getAttribute("data-"+b);if(typeof d==="string"){try{d=d==="true"?true:d==="false"?false:d==="null"?null:!c.isNaN(d)?parseFloat(d):Ja.test(d)?c.parseJSON(d):d}catch(e){}c.data(a,b,d)}else d=B}return d}function U(){return false}function ca(){return true}function la(a,b,d){d[0].type=a;return c.event.handle.apply(b,d)}function Ka(a){var b,d,e,f,h,l,k,o,x,r,A,C=[];f=[];h=c.data(this,this.nodeType?"events":"__events__");if(typeof h==="function")h=
+h.events;if(!(a.liveFired===this||!h||!h.live||a.button&&a.type==="click")){if(a.namespace)A=RegExp("(^|\\.)"+a.namespace.split(".").join("\\.(?:.*\\.)?")+"(\\.|$)");a.liveFired=this;var J=h.live.slice(0);for(k=0;k<J.length;k++){h=J[k];h.origType.replace(X,"")===a.type?f.push(h.selector):J.splice(k--,1)}f=c(a.target).closest(f,a.currentTarget);o=0;for(x=f.length;o<x;o++){r=f[o];for(k=0;k<J.length;k++){h=J[k];if(r.selector===h.selector&&(!A||A.test(h.namespace))){l=r.elem;e=null;if(h.preType==="mouseenter"||
+h.preType==="mouseleave"){a.type=h.preType;e=c(a.relatedTarget).closest(h.selector)[0]}if(!e||e!==l)C.push({elem:l,handleObj:h,level:r.level})}}}o=0;for(x=C.length;o<x;o++){f=C[o];if(d&&f.level>d)break;a.currentTarget=f.elem;a.data=f.handleObj.data;a.handleObj=f.handleObj;A=f.handleObj.origHandler.apply(f.elem,arguments);if(A===false||a.isPropagationStopped()){d=f.level;if(A===false)b=false;if(a.isImmediatePropagationStopped())break}}return b}}function Y(a,b){return(a&&a!=="*"?a+".":"")+b.replace(La,
+"`").replace(Ma,"&")}function ma(a,b,d){if(c.isFunction(b))return c.grep(a,function(f,h){return!!b.call(f,h,f)===d});else if(b.nodeType)return c.grep(a,function(f){return f===b===d});else if(typeof b==="string"){var e=c.grep(a,function(f){return f.nodeType===1});if(Na.test(b))return c.filter(b,e,!d);else b=c.filter(b,e)}return c.grep(a,function(f){return c.inArray(f,b)>=0===d})}function na(a,b){var d=0;b.each(function(){if(this.nodeName===(a[d]&&a[d].nodeName)){var e=c.data(a[d++]),f=c.data(this,
+e);if(e=e&&e.events){delete f.handle;f.events={};for(var h in e)for(var l in e[h])c.event.add(this,h,e[h][l],e[h][l].data)}}})}function Oa(a,b){b.src?c.ajax({url:b.src,async:false,dataType:"script"}):c.globalEval(b.text||b.textContent||b.innerHTML||"");b.parentNode&&b.parentNode.removeChild(b)}function oa(a,b,d){var e=b==="width"?a.offsetWidth:a.offsetHeight;if(d==="border")return e;c.each(b==="width"?Pa:Qa,function(){d||(e-=parseFloat(c.css(a,"padding"+this))||0);if(d==="margin")e+=parseFloat(c.css(a,
+"margin"+this))||0;else e-=parseFloat(c.css(a,"border"+this+"Width"))||0});return e}function da(a,b,d,e){if(c.isArray(b)&&b.length)c.each(b,function(f,h){d||Ra.test(a)?e(a,h):da(a+"["+(typeof h==="object"||c.isArray(h)?f:"")+"]",h,d,e)});else if(!d&&b!=null&&typeof b==="object")c.isEmptyObject(b)?e(a,""):c.each(b,function(f,h){da(a+"["+f+"]",h,d,e)});else e(a,b)}function S(a,b){var d={};c.each(pa.concat.apply([],pa.slice(0,b)),function(){d[this]=a});return d}function qa(a){if(!ea[a]){var b=c("<"+
+a+">").appendTo("body"),d=b.css("display");b.remove();if(d==="none"||d==="")d="block";ea[a]=d}return ea[a]}function fa(a){return c.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:false}var t=E.document,c=function(){function a(){if(!b.isReady){try{t.documentElement.doScroll("left")}catch(j){setTimeout(a,1);return}b.ready()}}var b=function(j,s){return new b.fn.init(j,s)},d=E.jQuery,e=E.$,f,h=/^(?:[^<]*(<[\w\W]+>)[^>]*$|#([\w\-]+)$)/,l=/\S/,k=/^\s+/,o=/\s+$/,x=/\W/,r=/\d/,A=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,
+C=/^[\],:{}\s]*$/,J=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,w=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,I=/(?:^|:|,)(?:\s*\[)+/g,L=/(webkit)[ \/]([\w.]+)/,g=/(opera)(?:.*version)?[ \/]([\w.]+)/,i=/(msie) ([\w.]+)/,n=/(mozilla)(?:.*? rv:([\w.]+))?/,m=navigator.userAgent,p=false,q=[],u,y=Object.prototype.toString,F=Object.prototype.hasOwnProperty,M=Array.prototype.push,N=Array.prototype.slice,O=String.prototype.trim,D=Array.prototype.indexOf,R={};b.fn=b.prototype={init:function(j,
+s){var v,z,H;if(!j)return this;if(j.nodeType){this.context=this[0]=j;this.length=1;return this}if(j==="body"&&!s&&t.body){this.context=t;this[0]=t.body;this.selector="body";this.length=1;return this}if(typeof j==="string")if((v=h.exec(j))&&(v[1]||!s))if(v[1]){H=s?s.ownerDocument||s:t;if(z=A.exec(j))if(b.isPlainObject(s)){j=[t.createElement(z[1])];b.fn.attr.call(j,s,true)}else j=[H.createElement(z[1])];else{z=b.buildFragment([v[1]],[H]);j=(z.cacheable?z.fragment.cloneNode(true):z.fragment).childNodes}return b.merge(this,
+j)}else{if((z=t.getElementById(v[2]))&&z.parentNode){if(z.id!==v[2])return f.find(j);this.length=1;this[0]=z}this.context=t;this.selector=j;return this}else if(!s&&!x.test(j)){this.selector=j;this.context=t;j=t.getElementsByTagName(j);return b.merge(this,j)}else return!s||s.jquery?(s||f).find(j):b(s).find(j);else if(b.isFunction(j))return f.ready(j);if(j.selector!==B){this.selector=j.selector;this.context=j.context}return b.makeArray(j,this)},selector:"",jquery:"1.4.4",length:0,size:function(){return this.length},
+toArray:function(){return N.call(this,0)},get:function(j){return j==null?this.toArray():j<0?this.slice(j)[0]:this[j]},pushStack:function(j,s,v){var z=b();b.isArray(j)?M.apply(z,j):b.merge(z,j);z.prevObject=this;z.context=this.context;if(s==="find")z.selector=this.selector+(this.selector?" ":"")+v;else if(s)z.selector=this.selector+"."+s+"("+v+")";return z},each:function(j,s){return b.each(this,j,s)},ready:function(j){b.bindReady();if(b.isReady)j.call(t,b);else q&&q.push(j);return this},eq:function(j){return j===
+-1?this.slice(j):this.slice(j,+j+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(N.apply(this,arguments),"slice",N.call(arguments).join(","))},map:function(j){return this.pushStack(b.map(this,function(s,v){return j.call(s,v,s)}))},end:function(){return this.prevObject||b(null)},push:M,sort:[].sort,splice:[].splice};b.fn.init.prototype=b.fn;b.extend=b.fn.extend=function(){var j,s,v,z,H,G=arguments[0]||{},K=1,Q=arguments.length,ga=false;
+if(typeof G==="boolean"){ga=G;G=arguments[1]||{};K=2}if(typeof G!=="object"&&!b.isFunction(G))G={};if(Q===K){G=this;--K}for(;K<Q;K++)if((j=arguments[K])!=null)for(s in j){v=G[s];z=j[s];if(G!==z)if(ga&&z&&(b.isPlainObject(z)||(H=b.isArray(z)))){if(H){H=false;v=v&&b.isArray(v)?v:[]}else v=v&&b.isPlainObject(v)?v:{};G[s]=b.extend(ga,v,z)}else if(z!==B)G[s]=z}return G};b.extend({noConflict:function(j){E.$=e;if(j)E.jQuery=d;return b},isReady:false,readyWait:1,ready:function(j){j===true&&b.readyWait--;
+if(!b.readyWait||j!==true&&!b.isReady){if(!t.body)return setTimeout(b.ready,1);b.isReady=true;if(!(j!==true&&--b.readyWait>0))if(q){var s=0,v=q;for(q=null;j=v[s++];)j.call(t,b);b.fn.trigger&&b(t).trigger("ready").unbind("ready")}}},bindReady:function(){if(!p){p=true;if(t.readyState==="complete")return setTimeout(b.ready,1);if(t.addEventListener){t.addEventListener("DOMContentLoaded",u,false);E.addEventListener("load",b.ready,false)}else if(t.attachEvent){t.attachEvent("onreadystatechange",u);E.attachEvent("onload",
+b.ready);var j=false;try{j=E.frameElement==null}catch(s){}t.documentElement.doScroll&&j&&a()}}},isFunction:function(j){return b.type(j)==="function"},isArray:Array.isArray||function(j){return b.type(j)==="array"},isWindow:function(j){return j&&typeof j==="object"&&"setInterval"in j},isNaN:function(j){return j==null||!r.test(j)||isNaN(j)},type:function(j){return j==null?String(j):R[y.call(j)]||"object"},isPlainObject:function(j){if(!j||b.type(j)!=="object"||j.nodeType||b.isWindow(j))return false;if(j.constructor&&
+!F.call(j,"constructor")&&!F.call(j.constructor.prototype,"isPrototypeOf"))return false;for(var s in j);return s===B||F.call(j,s)},isEmptyObject:function(j){for(var s in j)return false;return true},error:function(j){throw j;},parseJSON:function(j){if(typeof j!=="string"||!j)return null;j=b.trim(j);if(C.test(j.replace(J,"@").replace(w,"]").replace(I,"")))return E.JSON&&E.JSON.parse?E.JSON.parse(j):(new Function("return "+j))();else b.error("Invalid JSON: "+j)},noop:function(){},globalEval:function(j){if(j&&
+l.test(j)){var s=t.getElementsByTagName("head")[0]||t.documentElement,v=t.createElement("script");v.type="text/javascript";if(b.support.scriptEval)v.appendChild(t.createTextNode(j));else v.text=j;s.insertBefore(v,s.firstChild);s.removeChild(v)}},nodeName:function(j,s){return j.nodeName&&j.nodeName.toUpperCase()===s.toUpperCase()},each:function(j,s,v){var z,H=0,G=j.length,K=G===B||b.isFunction(j);if(v)if(K)for(z in j){if(s.apply(j[z],v)===false)break}else for(;H<G;){if(s.apply(j[H++],v)===false)break}else if(K)for(z in j){if(s.call(j[z],
+z,j[z])===false)break}else for(v=j[0];H<G&&s.call(v,H,v)!==false;v=j[++H]);return j},trim:O?function(j){return j==null?"":O.call(j)}:function(j){return j==null?"":j.toString().replace(k,"").replace(o,"")},makeArray:function(j,s){var v=s||[];if(j!=null){var z=b.type(j);j.length==null||z==="string"||z==="function"||z==="regexp"||b.isWindow(j)?M.call(v,j):b.merge(v,j)}return v},inArray:function(j,s){if(s.indexOf)return s.indexOf(j);for(var v=0,z=s.length;v<z;v++)if(s[v]===j)return v;return-1},merge:function(j,
+s){var v=j.length,z=0;if(typeof s.length==="number")for(var H=s.length;z<H;z++)j[v++]=s[z];else for(;s[z]!==B;)j[v++]=s[z++];j.length=v;return j},grep:function(j,s,v){var z=[],H;v=!!v;for(var G=0,K=j.length;G<K;G++){H=!!s(j[G],G);v!==H&&z.push(j[G])}return z},map:function(j,s,v){for(var z=[],H,G=0,K=j.length;G<K;G++){H=s(j[G],G,v);if(H!=null)z[z.length]=H}return z.concat.apply([],z)},guid:1,proxy:function(j,s,v){if(arguments.length===2)if(typeof s==="string"){v=j;j=v[s];s=B}else if(s&&!b.isFunction(s)){v=
+s;s=B}if(!s&&j)s=function(){return j.apply(v||this,arguments)};if(j)s.guid=j.guid=j.guid||s.guid||b.guid++;return s},access:function(j,s,v,z,H,G){var K=j.length;if(typeof s==="object"){for(var Q in s)b.access(j,Q,s[Q],z,H,v);return j}if(v!==B){z=!G&&z&&b.isFunction(v);for(Q=0;Q<K;Q++)H(j[Q],s,z?v.call(j[Q],Q,H(j[Q],s)):v,G);return j}return K?H(j[0],s):B},now:function(){return(new Date).getTime()},uaMatch:function(j){j=j.toLowerCase();j=L.exec(j)||g.exec(j)||i.exec(j)||j.indexOf("compatible")<0&&n.exec(j)||
+[];return{browser:j[1]||"",version:j[2]||"0"}},browser:{}});b.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(j,s){R["[object "+s+"]"]=s.toLowerCase()});m=b.uaMatch(m);if(m.browser){b.browser[m.browser]=true;b.browser.version=m.version}if(b.browser.webkit)b.browser.safari=true;if(D)b.inArray=function(j,s){return D.call(s,j)};if(!/\s/.test("\u00a0")){k=/^[\s\xA0]+/;o=/[\s\xA0]+$/}f=b(t);if(t.addEventListener)u=function(){t.removeEventListener("DOMContentLoaded",u,
+false);b.ready()};else if(t.attachEvent)u=function(){if(t.readyState==="complete"){t.detachEvent("onreadystatechange",u);b.ready()}};return E.jQuery=E.$=b}();(function(){c.support={};var a=t.documentElement,b=t.createElement("script"),d=t.createElement("div"),e="script"+c.now();d.style.display="none";d.innerHTML="   <link/><table></table><a href='/a' style='color:red;float:left;opacity:.55;'>a</a><input type='checkbox'/>";var f=d.getElementsByTagName("*"),h=d.getElementsByTagName("a")[0],l=t.createElement("select"),
+k=l.appendChild(t.createElement("option"));if(!(!f||!f.length||!h)){c.support={leadingWhitespace:d.firstChild.nodeType===3,tbody:!d.getElementsByTagName("tbody").length,htmlSerialize:!!d.getElementsByTagName("link").length,style:/red/.test(h.getAttribute("style")),hrefNormalized:h.getAttribute("href")==="/a",opacity:/^0.55$/.test(h.style.opacity),cssFloat:!!h.style.cssFloat,checkOn:d.getElementsByTagName("input")[0].value==="on",optSelected:k.selected,deleteExpando:true,optDisabled:false,checkClone:false,
+scriptEval:false,noCloneEvent:true,boxModel:null,inlineBlockNeedsLayout:false,shrinkWrapBlocks:false,reliableHiddenOffsets:true};l.disabled=true;c.support.optDisabled=!k.disabled;b.type="text/javascript";try{b.appendChild(t.createTextNode("window."+e+"=1;"))}catch(o){}a.insertBefore(b,a.firstChild);if(E[e]){c.support.scriptEval=true;delete E[e]}try{delete b.test}catch(x){c.support.deleteExpando=false}a.removeChild(b);if(d.attachEvent&&d.fireEvent){d.attachEvent("onclick",function r(){c.support.noCloneEvent=
+false;d.detachEvent("onclick",r)});d.cloneNode(true).fireEvent("onclick")}d=t.createElement("div");d.innerHTML="<input type='radio' name='radiotest' checked='checked'/>";a=t.createDocumentFragment();a.appendChild(d.firstChild);c.support.checkClone=a.cloneNode(true).cloneNode(true).lastChild.checked;c(function(){var r=t.createElement("div");r.style.width=r.style.paddingLeft="1px";t.body.appendChild(r);c.boxModel=c.support.boxModel=r.offsetWidth===2;if("zoom"in r.style){r.style.display="inline";r.style.zoom=
+1;c.support.inlineBlockNeedsLayout=r.offsetWidth===2;r.style.display="";r.innerHTML="<div style='width:4px;'></div>";c.support.shrinkWrapBlocks=r.offsetWidth!==2}r.innerHTML="<table><tr><td style='padding:0;display:none'></td><td>t</td></tr></table>";var A=r.getElementsByTagName("td");c.support.reliableHiddenOffsets=A[0].offsetHeight===0;A[0].style.display="";A[1].style.display="none";c.support.reliableHiddenOffsets=c.support.reliableHiddenOffsets&&A[0].offsetHeight===0;r.innerHTML="";t.body.removeChild(r).style.display=
+"none"});a=function(r){var A=t.createElement("div");r="on"+r;var C=r in A;if(!C){A.setAttribute(r,"return;");C=typeof A[r]==="function"}return C};c.support.submitBubbles=a("submit");c.support.changeBubbles=a("change");a=b=d=f=h=null}})();var ra={},Ja=/^(?:\{.*\}|\[.*\])$/;c.extend({cache:{},uuid:0,expando:"jQuery"+c.now(),noData:{embed:true,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:true},data:function(a,b,d){if(c.acceptData(a)){a=a==E?ra:a;var e=a.nodeType,f=e?a[c.expando]:null,h=
+c.cache;if(!(e&&!f&&typeof b==="string"&&d===B)){if(e)f||(a[c.expando]=f=++c.uuid);else h=a;if(typeof b==="object")if(e)h[f]=c.extend(h[f],b);else c.extend(h,b);else if(e&&!h[f])h[f]={};a=e?h[f]:h;if(d!==B)a[b]=d;return typeof b==="string"?a[b]:a}}},removeData:function(a,b){if(c.acceptData(a)){a=a==E?ra:a;var d=a.nodeType,e=d?a[c.expando]:a,f=c.cache,h=d?f[e]:e;if(b){if(h){delete h[b];d&&c.isEmptyObject(h)&&c.removeData(a)}}else if(d&&c.support.deleteExpando)delete a[c.expando];else if(a.removeAttribute)a.removeAttribute(c.expando);
+else if(d)delete f[e];else for(var l in a)delete a[l]}},acceptData:function(a){if(a.nodeName){var b=c.noData[a.nodeName.toLowerCase()];if(b)return!(b===true||a.getAttribute("classid")!==b)}return true}});c.fn.extend({data:function(a,b){var d=null;if(typeof a==="undefined"){if(this.length){var e=this[0].attributes,f;d=c.data(this[0]);for(var h=0,l=e.length;h<l;h++){f=e[h].name;if(f.indexOf("data-")===0){f=f.substr(5);ka(this[0],f,d[f])}}}return d}else if(typeof a==="object")return this.each(function(){c.data(this,
+a)});var k=a.split(".");k[1]=k[1]?"."+k[1]:"";if(b===B){d=this.triggerHandler("getData"+k[1]+"!",[k[0]]);if(d===B&&this.length){d=c.data(this[0],a);d=ka(this[0],a,d)}return d===B&&k[1]?this.data(k[0]):d}else return this.each(function(){var o=c(this),x=[k[0],b];o.triggerHandler("setData"+k[1]+"!",x);c.data(this,a,b);o.triggerHandler("changeData"+k[1]+"!",x)})},removeData:function(a){return this.each(function(){c.removeData(this,a)})}});c.extend({queue:function(a,b,d){if(a){b=(b||"fx")+"queue";var e=
+c.data(a,b);if(!d)return e||[];if(!e||c.isArray(d))e=c.data(a,b,c.makeArray(d));else e.push(d);return e}},dequeue:function(a,b){b=b||"fx";var d=c.queue(a,b),e=d.shift();if(e==="inprogress")e=d.shift();if(e){b==="fx"&&d.unshift("inprogress");e.call(a,function(){c.dequeue(a,b)})}}});c.fn.extend({queue:function(a,b){if(typeof a!=="string"){b=a;a="fx"}if(b===B)return c.queue(this[0],a);return this.each(function(){var d=c.queue(this,a,b);a==="fx"&&d[0]!=="inprogress"&&c.dequeue(this,a)})},dequeue:function(a){return this.each(function(){c.dequeue(this,
+a)})},delay:function(a,b){a=c.fx?c.fx.speeds[a]||a:a;b=b||"fx";return this.queue(b,function(){var d=this;setTimeout(function(){c.dequeue(d,b)},a)})},clearQueue:function(a){return this.queue(a||"fx",[])}});var sa=/[\n\t]/g,ha=/\s+/,Sa=/\r/g,Ta=/^(?:href|src|style)$/,Ua=/^(?:button|input)$/i,Va=/^(?:button|input|object|select|textarea)$/i,Wa=/^a(?:rea)?$/i,ta=/^(?:radio|checkbox)$/i;c.props={"for":"htmlFor","class":"className",readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing",rowspan:"rowSpan",
+colspan:"colSpan",tabindex:"tabIndex",usemap:"useMap",frameborder:"frameBorder"};c.fn.extend({attr:function(a,b){return c.access(this,a,b,true,c.attr)},removeAttr:function(a){return this.each(function(){c.attr(this,a,"");this.nodeType===1&&this.removeAttribute(a)})},addClass:function(a){if(c.isFunction(a))return this.each(function(x){var r=c(this);r.addClass(a.call(this,x,r.attr("class")))});if(a&&typeof a==="string")for(var b=(a||"").split(ha),d=0,e=this.length;d<e;d++){var f=this[d];if(f.nodeType===
+1)if(f.className){for(var h=" "+f.className+" ",l=f.className,k=0,o=b.length;k<o;k++)if(h.indexOf(" "+b[k]+" ")<0)l+=" "+b[k];f.className=c.trim(l)}else f.className=a}return this},removeClass:function(a){if(c.isFunction(a))return this.each(function(o){var x=c(this);x.removeClass(a.call(this,o,x.attr("class")))});if(a&&typeof a==="string"||a===B)for(var b=(a||"").split(ha),d=0,e=this.length;d<e;d++){var f=this[d];if(f.nodeType===1&&f.className)if(a){for(var h=(" "+f.className+" ").replace(sa," "),
+l=0,k=b.length;l<k;l++)h=h.replace(" "+b[l]+" "," ");f.className=c.trim(h)}else f.className=""}return this},toggleClass:function(a,b){var d=typeof a,e=typeof b==="boolean";if(c.isFunction(a))return this.each(function(f){var h=c(this);h.toggleClass(a.call(this,f,h.attr("class"),b),b)});return this.each(function(){if(d==="string")for(var f,h=0,l=c(this),k=b,o=a.split(ha);f=o[h++];){k=e?k:!l.hasClass(f);l[k?"addClass":"removeClass"](f)}else if(d==="undefined"||d==="boolean"){this.className&&c.data(this,
+"__className__",this.className);this.className=this.className||a===false?"":c.data(this,"__className__")||""}})},hasClass:function(a){a=" "+a+" ";for(var b=0,d=this.length;b<d;b++)if((" "+this[b].className+" ").replace(sa," ").indexOf(a)>-1)return true;return false},val:function(a){if(!arguments.length){var b=this[0];if(b){if(c.nodeName(b,"option")){var d=b.attributes.value;return!d||d.specified?b.value:b.text}if(c.nodeName(b,"select")){var e=b.selectedIndex;d=[];var f=b.options;b=b.type==="select-one";
+if(e<0)return null;var h=b?e:0;for(e=b?e+1:f.length;h<e;h++){var l=f[h];if(l.selected&&(c.support.optDisabled?!l.disabled:l.getAttribute("disabled")===null)&&(!l.parentNode.disabled||!c.nodeName(l.parentNode,"optgroup"))){a=c(l).val();if(b)return a;d.push(a)}}return d}if(ta.test(b.type)&&!c.support.checkOn)return b.getAttribute("value")===null?"on":b.value;return(b.value||"").replace(Sa,"")}return B}var k=c.isFunction(a);return this.each(function(o){var x=c(this),r=a;if(this.nodeType===1){if(k)r=
+a.call(this,o,x.val());if(r==null)r="";else if(typeof r==="number")r+="";else if(c.isArray(r))r=c.map(r,function(C){return C==null?"":C+""});if(c.isArray(r)&&ta.test(this.type))this.checked=c.inArray(x.val(),r)>=0;else if(c.nodeName(this,"select")){var A=c.makeArray(r);c("option",this).each(function(){this.selected=c.inArray(c(this).val(),A)>=0});if(!A.length)this.selectedIndex=-1}else this.value=r}})}});c.extend({attrFn:{val:true,css:true,html:true,text:true,data:true,width:true,height:true,offset:true},
+attr:function(a,b,d,e){if(!a||a.nodeType===3||a.nodeType===8)return B;if(e&&b in c.attrFn)return c(a)[b](d);e=a.nodeType!==1||!c.isXMLDoc(a);var f=d!==B;b=e&&c.props[b]||b;var h=Ta.test(b);if((b in a||a[b]!==B)&&e&&!h){if(f){b==="type"&&Ua.test(a.nodeName)&&a.parentNode&&c.error("type property can't be changed");if(d===null)a.nodeType===1&&a.removeAttribute(b);else a[b]=d}if(c.nodeName(a,"form")&&a.getAttributeNode(b))return a.getAttributeNode(b).nodeValue;if(b==="tabIndex")return(b=a.getAttributeNode("tabIndex"))&&
+b.specified?b.value:Va.test(a.nodeName)||Wa.test(a.nodeName)&&a.href?0:B;return a[b]}if(!c.support.style&&e&&b==="style"){if(f)a.style.cssText=""+d;return a.style.cssText}f&&a.setAttribute(b,""+d);if(!a.attributes[b]&&a.hasAttribute&&!a.hasAttribute(b))return B;a=!c.support.hrefNormalized&&e&&h?a.getAttribute(b,2):a.getAttribute(b);return a===null?B:a}});var X=/\.(.*)$/,ia=/^(?:textarea|input|select)$/i,La=/\./g,Ma=/ /g,Xa=/[^\w\s.|`]/g,Ya=function(a){return a.replace(Xa,"\\$&")},ua={focusin:0,focusout:0};
+c.event={add:function(a,b,d,e){if(!(a.nodeType===3||a.nodeType===8)){if(c.isWindow(a)&&a!==E&&!a.frameElement)a=E;if(d===false)d=U;else if(!d)return;var f,h;if(d.handler){f=d;d=f.handler}if(!d.guid)d.guid=c.guid++;if(h=c.data(a)){var l=a.nodeType?"events":"__events__",k=h[l],o=h.handle;if(typeof k==="function"){o=k.handle;k=k.events}else if(!k){a.nodeType||(h[l]=h=function(){});h.events=k={}}if(!o)h.handle=o=function(){return typeof c!=="undefined"&&!c.event.triggered?c.event.handle.apply(o.elem,
+arguments):B};o.elem=a;b=b.split(" ");for(var x=0,r;l=b[x++];){h=f?c.extend({},f):{handler:d,data:e};if(l.indexOf(".")>-1){r=l.split(".");l=r.shift();h.namespace=r.slice(0).sort().join(".")}else{r=[];h.namespace=""}h.type=l;if(!h.guid)h.guid=d.guid;var A=k[l],C=c.event.special[l]||{};if(!A){A=k[l]=[];if(!C.setup||C.setup.call(a,e,r,o)===false)if(a.addEventListener)a.addEventListener(l,o,false);else a.attachEvent&&a.attachEvent("on"+l,o)}if(C.add){C.add.call(a,h);if(!h.handler.guid)h.handler.guid=
+d.guid}A.push(h);c.event.global[l]=true}a=null}}},global:{},remove:function(a,b,d,e){if(!(a.nodeType===3||a.nodeType===8)){if(d===false)d=U;var f,h,l=0,k,o,x,r,A,C,J=a.nodeType?"events":"__events__",w=c.data(a),I=w&&w[J];if(w&&I){if(typeof I==="function"){w=I;I=I.events}if(b&&b.type){d=b.handler;b=b.type}if(!b||typeof b==="string"&&b.charAt(0)==="."){b=b||"";for(f in I)c.event.remove(a,f+b)}else{for(b=b.split(" ");f=b[l++];){r=f;k=f.indexOf(".")<0;o=[];if(!k){o=f.split(".");f=o.shift();x=RegExp("(^|\\.)"+
+c.map(o.slice(0).sort(),Ya).join("\\.(?:.*\\.)?")+"(\\.|$)")}if(A=I[f])if(d){r=c.event.special[f]||{};for(h=e||0;h<A.length;h++){C=A[h];if(d.guid===C.guid){if(k||x.test(C.namespace)){e==null&&A.splice(h--,1);r.remove&&r.remove.call(a,C)}if(e!=null)break}}if(A.length===0||e!=null&&A.length===1){if(!r.teardown||r.teardown.call(a,o)===false)c.removeEvent(a,f,w.handle);delete I[f]}}else for(h=0;h<A.length;h++){C=A[h];if(k||x.test(C.namespace)){c.event.remove(a,r,C.handler,h);A.splice(h--,1)}}}if(c.isEmptyObject(I)){if(b=
+w.handle)b.elem=null;delete w.events;delete w.handle;if(typeof w==="function")c.removeData(a,J);else c.isEmptyObject(w)&&c.removeData(a)}}}}},trigger:function(a,b,d,e){var f=a.type||a;if(!e){a=typeof a==="object"?a[c.expando]?a:c.extend(c.Event(f),a):c.Event(f);if(f.indexOf("!")>=0){a.type=f=f.slice(0,-1);a.exclusive=true}if(!d){a.stopPropagation();c.event.global[f]&&c.each(c.cache,function(){this.events&&this.events[f]&&c.event.trigger(a,b,this.handle.elem)})}if(!d||d.nodeType===3||d.nodeType===
+8)return B;a.result=B;a.target=d;b=c.makeArray(b);b.unshift(a)}a.currentTarget=d;(e=d.nodeType?c.data(d,"handle"):(c.data(d,"__events__")||{}).handle)&&e.apply(d,b);e=d.parentNode||d.ownerDocument;try{if(!(d&&d.nodeName&&c.noData[d.nodeName.toLowerCase()]))if(d["on"+f]&&d["on"+f].apply(d,b)===false){a.result=false;a.preventDefault()}}catch(h){}if(!a.isPropagationStopped()&&e)c.event.trigger(a,b,e,true);else if(!a.isDefaultPrevented()){var l;e=a.target;var k=f.replace(X,""),o=c.nodeName(e,"a")&&k===
+"click",x=c.event.special[k]||{};if((!x._default||x._default.call(d,a)===false)&&!o&&!(e&&e.nodeName&&c.noData[e.nodeName.toLowerCase()])){try{if(e[k]){if(l=e["on"+k])e["on"+k]=null;c.event.triggered=true;e[k]()}}catch(r){}if(l)e["on"+k]=l;c.event.triggered=false}}},handle:function(a){var b,d,e,f;d=[];var h=c.makeArray(arguments);a=h[0]=c.event.fix(a||E.event);a.currentTarget=this;b=a.type.indexOf(".")<0&&!a.exclusive;if(!b){e=a.type.split(".");a.type=e.shift();d=e.slice(0).sort();e=RegExp("(^|\\.)"+
+d.join("\\.(?:.*\\.)?")+"(\\.|$)")}a.namespace=a.namespace||d.join(".");f=c.data(this,this.nodeType?"events":"__events__");if(typeof f==="function")f=f.events;d=(f||{})[a.type];if(f&&d){d=d.slice(0);f=0;for(var l=d.length;f<l;f++){var k=d[f];if(b||e.test(k.namespace)){a.handler=k.handler;a.data=k.data;a.handleObj=k;k=k.handler.apply(this,h);if(k!==B){a.result=k;if(k===false){a.preventDefault();a.stopPropagation()}}if(a.isImmediatePropagationStopped())break}}}return a.result},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),
+fix:function(a){if(a[c.expando])return a;var b=a;a=c.Event(b);for(var d=this.props.length,e;d;){e=this.props[--d];a[e]=b[e]}if(!a.target)a.target=a.srcElement||t;if(a.target.nodeType===3)a.target=a.target.parentNode;if(!a.relatedTarget&&a.fromElement)a.relatedTarget=a.fromElement===a.target?a.toElement:a.fromElement;if(a.pageX==null&&a.clientX!=null){b=t.documentElement;d=t.body;a.pageX=a.clientX+(b&&b.scrollLeft||d&&d.scrollLeft||0)-(b&&b.clientLeft||d&&d.clientLeft||0);a.pageY=a.clientY+(b&&b.scrollTop||
+d&&d.scrollTop||0)-(b&&b.clientTop||d&&d.clientTop||0)}if(a.which==null&&(a.charCode!=null||a.keyCode!=null))a.which=a.charCode!=null?a.charCode:a.keyCode;if(!a.metaKey&&a.ctrlKey)a.metaKey=a.ctrlKey;if(!a.which&&a.button!==B)a.which=a.button&1?1:a.button&2?3:a.button&4?2:0;return a},guid:1E8,proxy:c.proxy,special:{ready:{setup:c.bindReady,teardown:c.noop},live:{add:function(a){c.event.add(this,Y(a.origType,a.selector),c.extend({},a,{handler:Ka,guid:a.handler.guid}))},remove:function(a){c.event.remove(this,
+Y(a.origType,a.selector),a)}},beforeunload:{setup:function(a,b,d){if(c.isWindow(this))this.onbeforeunload=d},teardown:function(a,b){if(this.onbeforeunload===b)this.onbeforeunload=null}}}};c.removeEvent=t.removeEventListener?function(a,b,d){a.removeEventListener&&a.removeEventListener(b,d,false)}:function(a,b,d){a.detachEvent&&a.detachEvent("on"+b,d)};c.Event=function(a){if(!this.preventDefault)return new c.Event(a);if(a&&a.type){this.originalEvent=a;this.type=a.type}else this.type=a;this.timeStamp=
+c.now();this[c.expando]=true};c.Event.prototype={preventDefault:function(){this.isDefaultPrevented=ca;var a=this.originalEvent;if(a)if(a.preventDefault)a.preventDefault();else a.returnValue=false},stopPropagation:function(){this.isPropagationStopped=ca;var a=this.originalEvent;if(a){a.stopPropagation&&a.stopPropagation();a.cancelBubble=true}},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=ca;this.stopPropagation()},isDefaultPrevented:U,isPropagationStopped:U,isImmediatePropagationStopped:U};
+var va=function(a){var b=a.relatedTarget;try{for(;b&&b!==this;)b=b.parentNode;if(b!==this){a.type=a.data;c.event.handle.apply(this,arguments)}}catch(d){}},wa=function(a){a.type=a.data;c.event.handle.apply(this,arguments)};c.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){c.event.special[a]={setup:function(d){c.event.add(this,b,d&&d.selector?wa:va,a)},teardown:function(d){c.event.remove(this,b,d&&d.selector?wa:va)}}});if(!c.support.submitBubbles)c.event.special.submit={setup:function(){if(this.nodeName.toLowerCase()!==
+"form"){c.event.add(this,"click.specialSubmit",function(a){var b=a.target,d=b.type;if((d==="submit"||d==="image")&&c(b).closest("form").length){a.liveFired=B;return la("submit",this,arguments)}});c.event.add(this,"keypress.specialSubmit",function(a){var b=a.target,d=b.type;if((d==="text"||d==="password")&&c(b).closest("form").length&&a.keyCode===13){a.liveFired=B;return la("submit",this,arguments)}})}else return false},teardown:function(){c.event.remove(this,".specialSubmit")}};if(!c.support.changeBubbles){var V,
+xa=function(a){var b=a.type,d=a.value;if(b==="radio"||b==="checkbox")d=a.checked;else if(b==="select-multiple")d=a.selectedIndex>-1?c.map(a.options,function(e){return e.selected}).join("-"):"";else if(a.nodeName.toLowerCase()==="select")d=a.selectedIndex;return d},Z=function(a,b){var d=a.target,e,f;if(!(!ia.test(d.nodeName)||d.readOnly)){e=c.data(d,"_change_data");f=xa(d);if(a.type!=="focusout"||d.type!=="radio")c.data(d,"_change_data",f);if(!(e===B||f===e))if(e!=null||f){a.type="change";a.liveFired=
+B;return c.event.trigger(a,b,d)}}};c.event.special.change={filters:{focusout:Z,beforedeactivate:Z,click:function(a){var b=a.target,d=b.type;if(d==="radio"||d==="checkbox"||b.nodeName.toLowerCase()==="select")return Z.call(this,a)},keydown:function(a){var b=a.target,d=b.type;if(a.keyCode===13&&b.nodeName.toLowerCase()!=="textarea"||a.keyCode===32&&(d==="checkbox"||d==="radio")||d==="select-multiple")return Z.call(this,a)},beforeactivate:function(a){a=a.target;c.data(a,"_change_data",xa(a))}},setup:function(){if(this.type===
+"file")return false;for(var a in V)c.event.add(this,a+".specialChange",V[a]);return ia.test(this.nodeName)},teardown:function(){c.event.remove(this,".specialChange");return ia.test(this.nodeName)}};V=c.event.special.change.filters;V.focus=V.beforeactivate}t.addEventListener&&c.each({focus:"focusin",blur:"focusout"},function(a,b){function d(e){e=c.event.fix(e);e.type=b;return c.event.trigger(e,null,e.target)}c.event.special[b]={setup:function(){ua[b]++===0&&t.addEventListener(a,d,true)},teardown:function(){--ua[b]===
+0&&t.removeEventListener(a,d,true)}}});c.each(["bind","one"],function(a,b){c.fn[b]=function(d,e,f){if(typeof d==="object"){for(var h in d)this[b](h,e,d[h],f);return this}if(c.isFunction(e)||e===false){f=e;e=B}var l=b==="one"?c.proxy(f,function(o){c(this).unbind(o,l);return f.apply(this,arguments)}):f;if(d==="unload"&&b!=="one")this.one(d,e,f);else{h=0;for(var k=this.length;h<k;h++)c.event.add(this[h],d,l,e)}return this}});c.fn.extend({unbind:function(a,b){if(typeof a==="object"&&!a.preventDefault)for(var d in a)this.unbind(d,
+a[d]);else{d=0;for(var e=this.length;d<e;d++)c.event.remove(this[d],a,b)}return this},delegate:function(a,b,d,e){return this.live(b,d,e,a)},undelegate:function(a,b,d){return arguments.length===0?this.unbind("live"):this.die(b,null,d,a)},trigger:function(a,b){return this.each(function(){c.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0]){var d=c.Event(a);d.preventDefault();d.stopPropagation();c.event.trigger(d,b,this[0]);return d.result}},toggle:function(a){for(var b=arguments,d=
+1;d<b.length;)c.proxy(a,b[d++]);return this.click(c.proxy(a,function(e){var f=(c.data(this,"lastToggle"+a.guid)||0)%d;c.data(this,"lastToggle"+a.guid,f+1);e.preventDefault();return b[f].apply(this,arguments)||false}))},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}});var ya={focus:"focusin",blur:"focusout",mouseenter:"mouseover",mouseleave:"mouseout"};c.each(["live","die"],function(a,b){c.fn[b]=function(d,e,f,h){var l,k=0,o,x,r=h||this.selector;h=h?this:c(this.context);if(typeof d===
+"object"&&!d.preventDefault){for(l in d)h[b](l,e,d[l],r);return this}if(c.isFunction(e)){f=e;e=B}for(d=(d||"").split(" ");(l=d[k++])!=null;){o=X.exec(l);x="";if(o){x=o[0];l=l.replace(X,"")}if(l==="hover")d.push("mouseenter"+x,"mouseleave"+x);else{o=l;if(l==="focus"||l==="blur"){d.push(ya[l]+x);l+=x}else l=(ya[l]||l)+x;if(b==="live"){x=0;for(var A=h.length;x<A;x++)c.event.add(h[x],"live."+Y(l,r),{data:e,selector:r,handler:f,origType:l,origHandler:f,preType:o})}else h.unbind("live."+Y(l,r),f)}}return this}});
+c.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".split(" "),function(a,b){c.fn[b]=function(d,e){if(e==null){e=d;d=null}return arguments.length>0?this.bind(b,d,e):this.trigger(b)};if(c.attrFn)c.attrFn[b]=true});E.attachEvent&&!E.addEventListener&&c(E).bind("unload",function(){for(var a in c.cache)if(c.cache[a].handle)try{c.event.remove(c.cache[a].handle.elem)}catch(b){}});
+(function(){function a(g,i,n,m,p,q){p=0;for(var u=m.length;p<u;p++){var y=m[p];if(y){var F=false;for(y=y[g];y;){if(y.sizcache===n){F=m[y.sizset];break}if(y.nodeType===1&&!q){y.sizcache=n;y.sizset=p}if(y.nodeName.toLowerCase()===i){F=y;break}y=y[g]}m[p]=F}}}function b(g,i,n,m,p,q){p=0;for(var u=m.length;p<u;p++){var y=m[p];if(y){var F=false;for(y=y[g];y;){if(y.sizcache===n){F=m[y.sizset];break}if(y.nodeType===1){if(!q){y.sizcache=n;y.sizset=p}if(typeof i!=="string"){if(y===i){F=true;break}}else if(k.filter(i,
+[y]).length>0){F=y;break}}y=y[g]}m[p]=F}}}var d=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,e=0,f=Object.prototype.toString,h=false,l=true;[0,0].sort(function(){l=false;return 0});var k=function(g,i,n,m){n=n||[];var p=i=i||t;if(i.nodeType!==1&&i.nodeType!==9)return[];if(!g||typeof g!=="string")return n;var q,u,y,F,M,N=true,O=k.isXML(i),D=[],R=g;do{d.exec("");if(q=d.exec(R)){R=q[3];D.push(q[1]);if(q[2]){F=q[3];
+break}}}while(q);if(D.length>1&&x.exec(g))if(D.length===2&&o.relative[D[0]])u=L(D[0]+D[1],i);else for(u=o.relative[D[0]]?[i]:k(D.shift(),i);D.length;){g=D.shift();if(o.relative[g])g+=D.shift();u=L(g,u)}else{if(!m&&D.length>1&&i.nodeType===9&&!O&&o.match.ID.test(D[0])&&!o.match.ID.test(D[D.length-1])){q=k.find(D.shift(),i,O);i=q.expr?k.filter(q.expr,q.set)[0]:q.set[0]}if(i){q=m?{expr:D.pop(),set:C(m)}:k.find(D.pop(),D.length===1&&(D[0]==="~"||D[0]==="+")&&i.parentNode?i.parentNode:i,O);u=q.expr?k.filter(q.expr,
+q.set):q.set;if(D.length>0)y=C(u);else N=false;for(;D.length;){q=M=D.pop();if(o.relative[M])q=D.pop();else M="";if(q==null)q=i;o.relative[M](y,q,O)}}else y=[]}y||(y=u);y||k.error(M||g);if(f.call(y)==="[object Array]")if(N)if(i&&i.nodeType===1)for(g=0;y[g]!=null;g++){if(y[g]&&(y[g]===true||y[g].nodeType===1&&k.contains(i,y[g])))n.push(u[g])}else for(g=0;y[g]!=null;g++)y[g]&&y[g].nodeType===1&&n.push(u[g]);else n.push.apply(n,y);else C(y,n);if(F){k(F,p,n,m);k.uniqueSort(n)}return n};k.uniqueSort=function(g){if(w){h=
+l;g.sort(w);if(h)for(var i=1;i<g.length;i++)g[i]===g[i-1]&&g.splice(i--,1)}return g};k.matches=function(g,i){return k(g,null,null,i)};k.matchesSelector=function(g,i){return k(i,null,null,[g]).length>0};k.find=function(g,i,n){var m;if(!g)return[];for(var p=0,q=o.order.length;p<q;p++){var u,y=o.order[p];if(u=o.leftMatch[y].exec(g)){var F=u[1];u.splice(1,1);if(F.substr(F.length-1)!=="\\"){u[1]=(u[1]||"").replace(/\\/g,"");m=o.find[y](u,i,n);if(m!=null){g=g.replace(o.match[y],"");break}}}}m||(m=i.getElementsByTagName("*"));
+return{set:m,expr:g}};k.filter=function(g,i,n,m){for(var p,q,u=g,y=[],F=i,M=i&&i[0]&&k.isXML(i[0]);g&&i.length;){for(var N in o.filter)if((p=o.leftMatch[N].exec(g))!=null&&p[2]){var O,D,R=o.filter[N];D=p[1];q=false;p.splice(1,1);if(D.substr(D.length-1)!=="\\"){if(F===y)y=[];if(o.preFilter[N])if(p=o.preFilter[N](p,F,n,y,m,M)){if(p===true)continue}else q=O=true;if(p)for(var j=0;(D=F[j])!=null;j++)if(D){O=R(D,p,j,F);var s=m^!!O;if(n&&O!=null)if(s)q=true;else F[j]=false;else if(s){y.push(D);q=true}}if(O!==
+B){n||(F=y);g=g.replace(o.match[N],"");if(!q)return[];break}}}if(g===u)if(q==null)k.error(g);else break;u=g}return F};k.error=function(g){throw"Syntax error, unrecognized expression: "+g;};var o=k.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|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\((even|odd|[\dn+\-]*)\))?/,
+POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(g){return g.getAttribute("href")}},relative:{"+":function(g,i){var n=typeof i==="string",m=n&&!/\W/.test(i);n=n&&!m;if(m)i=i.toLowerCase();m=0;for(var p=g.length,q;m<p;m++)if(q=g[m]){for(;(q=q.previousSibling)&&q.nodeType!==1;);g[m]=n||q&&q.nodeName.toLowerCase()===
+i?q||false:q===i}n&&k.filter(i,g,true)},">":function(g,i){var n,m=typeof i==="string",p=0,q=g.length;if(m&&!/\W/.test(i))for(i=i.toLowerCase();p<q;p++){if(n=g[p]){n=n.parentNode;g[p]=n.nodeName.toLowerCase()===i?n:false}}else{for(;p<q;p++)if(n=g[p])g[p]=m?n.parentNode:n.parentNode===i;m&&k.filter(i,g,true)}},"":function(g,i,n){var m,p=e++,q=b;if(typeof i==="string"&&!/\W/.test(i)){m=i=i.toLowerCase();q=a}q("parentNode",i,p,g,m,n)},"~":function(g,i,n){var m,p=e++,q=b;if(typeof i==="string"&&!/\W/.test(i)){m=
+i=i.toLowerCase();q=a}q("previousSibling",i,p,g,m,n)}},find:{ID:function(g,i,n){if(typeof i.getElementById!=="undefined"&&!n)return(g=i.getElementById(g[1]))&&g.parentNode?[g]:[]},NAME:function(g,i){if(typeof i.getElementsByName!=="undefined"){for(var n=[],m=i.getElementsByName(g[1]),p=0,q=m.length;p<q;p++)m[p].getAttribute("name")===g[1]&&n.push(m[p]);return n.length===0?null:n}},TAG:function(g,i){return i.getElementsByTagName(g[1])}},preFilter:{CLASS:function(g,i,n,m,p,q){g=" "+g[1].replace(/\\/g,
+"")+" ";if(q)return g;q=0;for(var u;(u=i[q])!=null;q++)if(u)if(p^(u.className&&(" "+u.className+" ").replace(/[\t\n]/g," ").indexOf(g)>=0))n||m.push(u);else if(n)i[q]=false;return false},ID:function(g){return g[1].replace(/\\/g,"")},TAG:function(g){return g[1].toLowerCase()},CHILD:function(g){if(g[1]==="nth"){var i=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(g[2]==="even"&&"2n"||g[2]==="odd"&&"2n+1"||!/\D/.test(g[2])&&"0n+"+g[2]||g[2]);g[2]=i[1]+(i[2]||1)-0;g[3]=i[3]-0}g[0]=e++;return g},ATTR:function(g,i,n,
+m,p,q){i=g[1].replace(/\\/g,"");if(!q&&o.attrMap[i])g[1]=o.attrMap[i];if(g[2]==="~=")g[4]=" "+g[4]+" ";return g},PSEUDO:function(g,i,n,m,p){if(g[1]==="not")if((d.exec(g[3])||"").length>1||/^\w/.test(g[3]))g[3]=k(g[3],null,null,i);else{g=k.filter(g[3],i,n,true^p);n||m.push.apply(m,g);return false}else if(o.match.POS.test(g[0])||o.match.CHILD.test(g[0]))return true;return g},POS:function(g){g.unshift(true);return g}},filters:{enabled:function(g){return g.disabled===false&&g.type!=="hidden"},disabled:function(g){return g.disabled===
+true},checked:function(g){return g.checked===true},selected:function(g){return g.selected===true},parent:function(g){return!!g.firstChild},empty:function(g){return!g.firstChild},has:function(g,i,n){return!!k(n[3],g).length},header:function(g){return/h\d/i.test(g.nodeName)},text:function(g){return"text"===g.type},radio:function(g){return"radio"===g.type},checkbox:function(g){return"checkbox"===g.type},file:function(g){return"file"===g.type},password:function(g){return"password"===g.type},submit:function(g){return"submit"===
+g.type},image:function(g){return"image"===g.type},reset:function(g){return"reset"===g.type},button:function(g){return"button"===g.type||g.nodeName.toLowerCase()==="button"},input:function(g){return/input|select|textarea|button/i.test(g.nodeName)}},setFilters:{first:function(g,i){return i===0},last:function(g,i,n,m){return i===m.length-1},even:function(g,i){return i%2===0},odd:function(g,i){return i%2===1},lt:function(g,i,n){return i<n[3]-0},gt:function(g,i,n){return i>n[3]-0},nth:function(g,i,n){return n[3]-
+0===i},eq:function(g,i,n){return n[3]-0===i}},filter:{PSEUDO:function(g,i,n,m){var p=i[1],q=o.filters[p];if(q)return q(g,n,i,m);else if(p==="contains")return(g.textContent||g.innerText||k.getText([g])||"").indexOf(i[3])>=0;else if(p==="not"){i=i[3];n=0;for(m=i.length;n<m;n++)if(i[n]===g)return false;return true}else k.error("Syntax error, unrecognized expression: "+p)},CHILD:function(g,i){var n=i[1],m=g;switch(n){case "only":case "first":for(;m=m.previousSibling;)if(m.nodeType===1)return false;if(n===
+"first")return true;m=g;case "last":for(;m=m.nextSibling;)if(m.nodeType===1)return false;return true;case "nth":n=i[2];var p=i[3];if(n===1&&p===0)return true;var q=i[0],u=g.parentNode;if(u&&(u.sizcache!==q||!g.nodeIndex)){var y=0;for(m=u.firstChild;m;m=m.nextSibling)if(m.nodeType===1)m.nodeIndex=++y;u.sizcache=q}m=g.nodeIndex-p;return n===0?m===0:m%n===0&&m/n>=0}},ID:function(g,i){return g.nodeType===1&&g.getAttribute("id")===i},TAG:function(g,i){return i==="*"&&g.nodeType===1||g.nodeName.toLowerCase()===
+i},CLASS:function(g,i){return(" "+(g.className||g.getAttribute("class"))+" ").indexOf(i)>-1},ATTR:function(g,i){var n=i[1];n=o.attrHandle[n]?o.attrHandle[n](g):g[n]!=null?g[n]:g.getAttribute(n);var m=n+"",p=i[2],q=i[4];return n==null?p==="!=":p==="="?m===q:p==="*="?m.indexOf(q)>=0:p==="~="?(" "+m+" ").indexOf(q)>=0:!q?m&&n!==false:p==="!="?m!==q:p==="^="?m.indexOf(q)===0:p==="$="?m.substr(m.length-q.length)===q:p==="|="?m===q||m.substr(0,q.length+1)===q+"-":false},POS:function(g,i,n,m){var p=o.setFilters[i[2]];
+if(p)return p(g,n,i,m)}}},x=o.match.POS,r=function(g,i){return"\\"+(i-0+1)},A;for(A in o.match){o.match[A]=RegExp(o.match[A].source+/(?![^\[]*\])(?![^\(]*\))/.source);o.leftMatch[A]=RegExp(/(^(?:.|\r|\n)*?)/.source+o.match[A].source.replace(/\\(\d+)/g,r))}var C=function(g,i){g=Array.prototype.slice.call(g,0);if(i){i.push.apply(i,g);return i}return g};try{Array.prototype.slice.call(t.documentElement.childNodes,0)}catch(J){C=function(g,i){var n=0,m=i||[];if(f.call(g)==="[object Array]")Array.prototype.push.apply(m,
+g);else if(typeof g.length==="number")for(var p=g.length;n<p;n++)m.push(g[n]);else for(;g[n];n++)m.push(g[n]);return m}}var w,I;if(t.documentElement.compareDocumentPosition)w=function(g,i){if(g===i){h=true;return 0}if(!g.compareDocumentPosition||!i.compareDocumentPosition)return g.compareDocumentPosition?-1:1;return g.compareDocumentPosition(i)&4?-1:1};else{w=function(g,i){var n,m,p=[],q=[];n=g.parentNode;m=i.parentNode;var u=n;if(g===i){h=true;return 0}else if(n===m)return I(g,i);else if(n){if(!m)return 1}else return-1;
+for(;u;){p.unshift(u);u=u.parentNode}for(u=m;u;){q.unshift(u);u=u.parentNode}n=p.length;m=q.length;for(u=0;u<n&&u<m;u++)if(p[u]!==q[u])return I(p[u],q[u]);return u===n?I(g,q[u],-1):I(p[u],i,1)};I=function(g,i,n){if(g===i)return n;for(g=g.nextSibling;g;){if(g===i)return-1;g=g.nextSibling}return 1}}k.getText=function(g){for(var i="",n,m=0;g[m];m++){n=g[m];if(n.nodeType===3||n.nodeType===4)i+=n.nodeValue;else if(n.nodeType!==8)i+=k.getText(n.childNodes)}return i};(function(){var g=t.createElement("div"),
+i="script"+(new Date).getTime(),n=t.documentElement;g.innerHTML="<a name='"+i+"'/>";n.insertBefore(g,n.firstChild);if(t.getElementById(i)){o.find.ID=function(m,p,q){if(typeof p.getElementById!=="undefined"&&!q)return(p=p.getElementById(m[1]))?p.id===m[1]||typeof p.getAttributeNode!=="undefined"&&p.getAttributeNode("id").nodeValue===m[1]?[p]:B:[]};o.filter.ID=function(m,p){var q=typeof m.getAttributeNode!=="undefined"&&m.getAttributeNode("id");return m.nodeType===1&&q&&q.nodeValue===p}}n.removeChild(g);
+n=g=null})();(function(){var g=t.createElement("div");g.appendChild(t.createComment(""));if(g.getElementsByTagName("*").length>0)o.find.TAG=function(i,n){var m=n.getElementsByTagName(i[1]);if(i[1]==="*"){for(var p=[],q=0;m[q];q++)m[q].nodeType===1&&p.push(m[q]);m=p}return m};g.innerHTML="<a href='#'></a>";if(g.firstChild&&typeof g.firstChild.getAttribute!=="undefined"&&g.firstChild.getAttribute("href")!=="#")o.attrHandle.href=function(i){return i.getAttribute("href",2)};g=null})();t.querySelectorAll&&
+function(){var g=k,i=t.createElement("div");i.innerHTML="<p class='TEST'></p>";if(!(i.querySelectorAll&&i.querySelectorAll(".TEST").length===0)){k=function(m,p,q,u){p=p||t;m=m.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!u&&!k.isXML(p))if(p.nodeType===9)try{return C(p.querySelectorAll(m),q)}catch(y){}else if(p.nodeType===1&&p.nodeName.toLowerCase()!=="object"){var F=p.getAttribute("id"),M=F||"__sizzle__";F||p.setAttribute("id",M);try{return C(p.querySelectorAll("#"+M+" "+m),q)}catch(N){}finally{F||
+p.removeAttribute("id")}}return g(m,p,q,u)};for(var n in g)k[n]=g[n];i=null}}();(function(){var g=t.documentElement,i=g.matchesSelector||g.mozMatchesSelector||g.webkitMatchesSelector||g.msMatchesSelector,n=false;try{i.call(t.documentElement,"[test!='']:sizzle")}catch(m){n=true}if(i)k.matchesSelector=function(p,q){q=q.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!k.isXML(p))try{if(n||!o.match.PSEUDO.test(q)&&!/!=/.test(q))return i.call(p,q)}catch(u){}return k(q,null,null,[p]).length>0}})();(function(){var g=
+t.createElement("div");g.innerHTML="<div class='test e'></div><div class='test'></div>";if(!(!g.getElementsByClassName||g.getElementsByClassName("e").length===0)){g.lastChild.className="e";if(g.getElementsByClassName("e").length!==1){o.order.splice(1,0,"CLASS");o.find.CLASS=function(i,n,m){if(typeof n.getElementsByClassName!=="undefined"&&!m)return n.getElementsByClassName(i[1])};g=null}}})();k.contains=t.documentElement.contains?function(g,i){return g!==i&&(g.contains?g.contains(i):true)}:t.documentElement.compareDocumentPosition?
+function(g,i){return!!(g.compareDocumentPosition(i)&16)}:function(){return false};k.isXML=function(g){return(g=(g?g.ownerDocument||g:0).documentElement)?g.nodeName!=="HTML":false};var L=function(g,i){for(var n,m=[],p="",q=i.nodeType?[i]:i;n=o.match.PSEUDO.exec(g);){p+=n[0];g=g.replace(o.match.PSEUDO,"")}g=o.relative[g]?g+"*":g;n=0;for(var u=q.length;n<u;n++)k(g,q[n],m);return k.filter(p,m)};c.find=k;c.expr=k.selectors;c.expr[":"]=c.expr.filters;c.unique=k.uniqueSort;c.text=k.getText;c.isXMLDoc=k.isXML;
+c.contains=k.contains})();var Za=/Until$/,$a=/^(?:parents|prevUntil|prevAll)/,ab=/,/,Na=/^.[^:#\[\.,]*$/,bb=Array.prototype.slice,cb=c.expr.match.POS;c.fn.extend({find:function(a){for(var b=this.pushStack("","find",a),d=0,e=0,f=this.length;e<f;e++){d=b.length;c.find(a,this[e],b);if(e>0)for(var h=d;h<b.length;h++)for(var l=0;l<d;l++)if(b[l]===b[h]){b.splice(h--,1);break}}return b},has:function(a){var b=c(a);return this.filter(function(){for(var d=0,e=b.length;d<e;d++)if(c.contains(this,b[d]))return true})},
+not:function(a){return this.pushStack(ma(this,a,false),"not",a)},filter:function(a){return this.pushStack(ma(this,a,true),"filter",a)},is:function(a){return!!a&&c.filter(a,this).length>0},closest:function(a,b){var d=[],e,f,h=this[0];if(c.isArray(a)){var l,k={},o=1;if(h&&a.length){e=0;for(f=a.length;e<f;e++){l=a[e];k[l]||(k[l]=c.expr.match.POS.test(l)?c(l,b||this.context):l)}for(;h&&h.ownerDocument&&h!==b;){for(l in k){e=k[l];if(e.jquery?e.index(h)>-1:c(h).is(e))d.push({selector:l,elem:h,level:o})}h=
+h.parentNode;o++}}return d}l=cb.test(a)?c(a,b||this.context):null;e=0;for(f=this.length;e<f;e++)for(h=this[e];h;)if(l?l.index(h)>-1:c.find.matchesSelector(h,a)){d.push(h);break}else{h=h.parentNode;if(!h||!h.ownerDocument||h===b)break}d=d.length>1?c.unique(d):d;return this.pushStack(d,"closest",a)},index:function(a){if(!a||typeof a==="string")return c.inArray(this[0],a?c(a):this.parent().children());return c.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var d=typeof a==="string"?c(a,b||this.context):
+c.makeArray(a),e=c.merge(this.get(),d);return this.pushStack(!d[0]||!d[0].parentNode||d[0].parentNode.nodeType===11||!e[0]||!e[0].parentNode||e[0].parentNode.nodeType===11?e:c.unique(e))},andSelf:function(){return this.add(this.prevObject)}});c.each({parent:function(a){return(a=a.parentNode)&&a.nodeType!==11?a:null},parents:function(a){return c.dir(a,"parentNode")},parentsUntil:function(a,b,d){return c.dir(a,"parentNode",d)},next:function(a){return c.nth(a,2,"nextSibling")},prev:function(a){return c.nth(a,
+2,"previousSibling")},nextAll:function(a){return c.dir(a,"nextSibling")},prevAll:function(a){return c.dir(a,"previousSibling")},nextUntil:function(a,b,d){return c.dir(a,"nextSibling",d)},prevUntil:function(a,b,d){return c.dir(a,"previousSibling",d)},siblings:function(a){return c.sibling(a.parentNode.firstChild,a)},children:function(a){return c.sibling(a.firstChild)},contents:function(a){return c.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:c.makeArray(a.childNodes)}},function(a,
+b){c.fn[a]=function(d,e){var f=c.map(this,b,d);Za.test(a)||(e=d);if(e&&typeof e==="string")f=c.filter(e,f);f=this.length>1?c.unique(f):f;if((this.length>1||ab.test(e))&&$a.test(a))f=f.reverse();return this.pushStack(f,a,bb.call(arguments).join(","))}});c.extend({filter:function(a,b,d){if(d)a=":not("+a+")";return b.length===1?c.find.matchesSelector(b[0],a)?[b[0]]:[]:c.find.matches(a,b)},dir:function(a,b,d){var e=[];for(a=a[b];a&&a.nodeType!==9&&(d===B||a.nodeType!==1||!c(a).is(d));){a.nodeType===1&&
+e.push(a);a=a[b]}return e},nth:function(a,b,d){b=b||1;for(var e=0;a;a=a[d])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){for(var d=[];a;a=a.nextSibling)a.nodeType===1&&a!==b&&d.push(a);return d}});var za=/ jQuery\d+="(?:\d+|null)"/g,$=/^\s+/,Aa=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,Ba=/<([\w:]+)/,db=/<tbody/i,eb=/<|&#?\w+;/,Ca=/<(?:script|object|embed|option|style)/i,Da=/checked\s*(?:[^=]|=\s*.checked.)/i,fb=/\=([^="'>\s]+\/)>/g,P={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,"",""]};P.optgroup=P.option;P.tbody=P.tfoot=P.colgroup=P.caption=P.thead;P.th=P.td;if(!c.support.htmlSerialize)P._default=[1,"div<div>","</div>"];c.fn.extend({text:function(a){if(c.isFunction(a))return this.each(function(b){var d=
+c(this);d.text(a.call(this,b,d.text()))});if(typeof a!=="object"&&a!==B)return this.empty().append((this[0]&&this[0].ownerDocument||t).createTextNode(a));return c.text(this)},wrapAll:function(a){if(c.isFunction(a))return this.each(function(d){c(this).wrapAll(a.call(this,d))});if(this[0]){var b=c(a,this[0].ownerDocument).eq(0).clone(true);this[0].parentNode&&b.insertBefore(this[0]);b.map(function(){for(var d=this;d.firstChild&&d.firstChild.nodeType===1;)d=d.firstChild;return d}).append(this)}return this},
+wrapInner:function(a){if(c.isFunction(a))return this.each(function(b){c(this).wrapInner(a.call(this,b))});return this.each(function(){var b=c(this),d=b.contents();d.length?d.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){c(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){c.nodeName(this,"body")||c(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.appendChild(a)})},
+prepend:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b,this)});else if(arguments.length){var a=c(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b,
+this.nextSibling)});else if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,c(arguments[0]).toArray());return a}},remove:function(a,b){for(var d=0,e;(e=this[d])!=null;d++)if(!a||c.filter(a,[e]).length){if(!b&&e.nodeType===1){c.cleanData(e.getElementsByTagName("*"));c.cleanData([e])}e.parentNode&&e.parentNode.removeChild(e)}return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++)for(b.nodeType===1&&c.cleanData(b.getElementsByTagName("*"));b.firstChild;)b.removeChild(b.firstChild);
+return this},clone:function(a){var b=this.map(function(){if(!c.support.noCloneEvent&&!c.isXMLDoc(this)){var d=this.outerHTML,e=this.ownerDocument;if(!d){d=e.createElement("div");d.appendChild(this.cloneNode(true));d=d.innerHTML}return c.clean([d.replace(za,"").replace(fb,'="$1">').replace($,"")],e)[0]}else return this.cloneNode(true)});if(a===true){na(this,b);na(this.find("*"),b.find("*"))}return b},html:function(a){if(a===B)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(za,""):null;
+else if(typeof a==="string"&&!Ca.test(a)&&(c.support.leadingWhitespace||!$.test(a))&&!P[(Ba.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Aa,"<$1></$2>");try{for(var b=0,d=this.length;b<d;b++)if(this[b].nodeType===1){c.cleanData(this[b].getElementsByTagName("*"));this[b].innerHTML=a}}catch(e){this.empty().append(a)}}else c.isFunction(a)?this.each(function(f){var h=c(this);h.html(a.call(this,f,h.html()))}):this.empty().append(a);return this},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(c.isFunction(a))return this.each(function(b){var d=
+c(this),e=d.html();d.replaceWith(a.call(this,b,e))});if(typeof a!=="string")a=c(a).detach();return this.each(function(){var b=this.nextSibling,d=this.parentNode;c(this).remove();b?c(b).before(a):c(d).append(a)})}else return this.pushStack(c(c.isFunction(a)?a():a),"replaceWith",a)},detach:function(a){return this.remove(a,true)},domManip:function(a,b,d){var e,f,h,l=a[0],k=[];if(!c.support.checkClone&&arguments.length===3&&typeof l==="string"&&Da.test(l))return this.each(function(){c(this).domManip(a,
+b,d,true)});if(c.isFunction(l))return this.each(function(x){var r=c(this);a[0]=l.call(this,x,b?r.html():B);r.domManip(a,b,d)});if(this[0]){e=l&&l.parentNode;e=c.support.parentNode&&e&&e.nodeType===11&&e.childNodes.length===this.length?{fragment:e}:c.buildFragment(a,this,k);h=e.fragment;if(f=h.childNodes.length===1?h=h.firstChild:h.firstChild){b=b&&c.nodeName(f,"tr");f=0;for(var o=this.length;f<o;f++)d.call(b?c.nodeName(this[f],"table")?this[f].getElementsByTagName("tbody")[0]||this[f].appendChild(this[f].ownerDocument.createElement("tbody")):
+this[f]:this[f],f>0||e.cacheable||this.length>1?h.cloneNode(true):h)}k.length&&c.each(k,Oa)}return this}});c.buildFragment=function(a,b,d){var e,f,h;b=b&&b[0]?b[0].ownerDocument||b[0]:t;if(a.length===1&&typeof a[0]==="string"&&a[0].length<512&&b===t&&!Ca.test(a[0])&&(c.support.checkClone||!Da.test(a[0]))){f=true;if(h=c.fragments[a[0]])if(h!==1)e=h}if(!e){e=b.createDocumentFragment();c.clean(a,b,e,d)}if(f)c.fragments[a[0]]=h?e:1;return{fragment:e,cacheable:f}};c.fragments={};c.each({appendTo:"append",
+prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){c.fn[a]=function(d){var e=[];d=c(d);var f=this.length===1&&this[0].parentNode;if(f&&f.nodeType===11&&f.childNodes.length===1&&d.length===1){d[b](this[0]);return this}else{f=0;for(var h=d.length;f<h;f++){var l=(f>0?this.clone(true):this).get();c(d[f])[b](l);e=e.concat(l)}return this.pushStack(e,a,d.selector)}}});c.extend({clean:function(a,b,d,e){b=b||t;if(typeof b.createElement==="undefined")b=b.ownerDocument||
+b[0]&&b[0].ownerDocument||t;for(var f=[],h=0,l;(l=a[h])!=null;h++){if(typeof l==="number")l+="";if(l){if(typeof l==="string"&&!eb.test(l))l=b.createTextNode(l);else if(typeof l==="string"){l=l.replace(Aa,"<$1></$2>");var k=(Ba.exec(l)||["",""])[1].toLowerCase(),o=P[k]||P._default,x=o[0],r=b.createElement("div");for(r.innerHTML=o[1]+l+o[2];x--;)r=r.lastChild;if(!c.support.tbody){x=db.test(l);k=k==="table"&&!x?r.firstChild&&r.firstChild.childNodes:o[1]==="<table>"&&!x?r.childNodes:[];for(o=k.length-
+1;o>=0;--o)c.nodeName(k[o],"tbody")&&!k[o].childNodes.length&&k[o].parentNode.removeChild(k[o])}!c.support.leadingWhitespace&&$.test(l)&&r.insertBefore(b.createTextNode($.exec(l)[0]),r.firstChild);l=r.childNodes}if(l.nodeType)f.push(l);else f=c.merge(f,l)}}if(d)for(h=0;f[h];h++)if(e&&c.nodeName(f[h],"script")&&(!f[h].type||f[h].type.toLowerCase()==="text/javascript"))e.push(f[h].parentNode?f[h].parentNode.removeChild(f[h]):f[h]);else{f[h].nodeType===1&&f.splice.apply(f,[h+1,0].concat(c.makeArray(f[h].getElementsByTagName("script"))));
+d.appendChild(f[h])}return f},cleanData:function(a){for(var b,d,e=c.cache,f=c.event.special,h=c.support.deleteExpando,l=0,k;(k=a[l])!=null;l++)if(!(k.nodeName&&c.noData[k.nodeName.toLowerCase()]))if(d=k[c.expando]){if((b=e[d])&&b.events)for(var o in b.events)f[o]?c.event.remove(k,o):c.removeEvent(k,o,b.handle);if(h)delete k[c.expando];else k.removeAttribute&&k.removeAttribute(c.expando);delete e[d]}}});var Ea=/alpha\([^)]*\)/i,gb=/opacity=([^)]*)/,hb=/-([a-z])/ig,ib=/([A-Z])/g,Fa=/^-?\d+(?:px)?$/i,
+jb=/^-?\d/,kb={position:"absolute",visibility:"hidden",display:"block"},Pa=["Left","Right"],Qa=["Top","Bottom"],W,Ga,aa,lb=function(a,b){return b.toUpperCase()};c.fn.css=function(a,b){if(arguments.length===2&&b===B)return this;return c.access(this,a,b,true,function(d,e,f){return f!==B?c.style(d,e,f):c.css(d,e)})};c.extend({cssHooks:{opacity:{get:function(a,b){if(b){var d=W(a,"opacity","opacity");return d===""?"1":d}else return a.style.opacity}}},cssNumber:{zIndex:true,fontWeight:true,opacity:true,
+zoom:true,lineHeight:true},cssProps:{"float":c.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,b,d,e){if(!(!a||a.nodeType===3||a.nodeType===8||!a.style)){var f,h=c.camelCase(b),l=a.style,k=c.cssHooks[h];b=c.cssProps[h]||h;if(d!==B){if(!(typeof d==="number"&&isNaN(d)||d==null)){if(typeof d==="number"&&!c.cssNumber[h])d+="px";if(!k||!("set"in k)||(d=k.set(a,d))!==B)try{l[b]=d}catch(o){}}}else{if(k&&"get"in k&&(f=k.get(a,false,e))!==B)return f;return l[b]}}},css:function(a,b,d){var e,f=c.camelCase(b),
+h=c.cssHooks[f];b=c.cssProps[f]||f;if(h&&"get"in h&&(e=h.get(a,true,d))!==B)return e;else if(W)return W(a,b,f)},swap:function(a,b,d){var e={},f;for(f in b){e[f]=a.style[f];a.style[f]=b[f]}d.call(a);for(f in b)a.style[f]=e[f]},camelCase:function(a){return a.replace(hb,lb)}});c.curCSS=c.css;c.each(["height","width"],function(a,b){c.cssHooks[b]={get:function(d,e,f){var h;if(e){if(d.offsetWidth!==0)h=oa(d,b,f);else c.swap(d,kb,function(){h=oa(d,b,f)});if(h<=0){h=W(d,b,b);if(h==="0px"&&aa)h=aa(d,b,b);
+if(h!=null)return h===""||h==="auto"?"0px":h}if(h<0||h==null){h=d.style[b];return h===""||h==="auto"?"0px":h}return typeof h==="string"?h:h+"px"}},set:function(d,e){if(Fa.test(e)){e=parseFloat(e);if(e>=0)return e+"px"}else return e}}});if(!c.support.opacity)c.cssHooks.opacity={get:function(a,b){return gb.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var d=a.style;d.zoom=1;var e=c.isNaN(b)?"":"alpha(opacity="+b*100+")",f=
+d.filter||"";d.filter=Ea.test(f)?f.replace(Ea,e):d.filter+" "+e}};if(t.defaultView&&t.defaultView.getComputedStyle)Ga=function(a,b,d){var e;d=d.replace(ib,"-$1").toLowerCase();if(!(b=a.ownerDocument.defaultView))return B;if(b=b.getComputedStyle(a,null)){e=b.getPropertyValue(d);if(e===""&&!c.contains(a.ownerDocument.documentElement,a))e=c.style(a,d)}return e};if(t.documentElement.currentStyle)aa=function(a,b){var d,e,f=a.currentStyle&&a.currentStyle[b],h=a.style;if(!Fa.test(f)&&jb.test(f)){d=h.left;
+e=a.runtimeStyle.left;a.runtimeStyle.left=a.currentStyle.left;h.left=b==="fontSize"?"1em":f||0;f=h.pixelLeft+"px";h.left=d;a.runtimeStyle.left=e}return f===""?"auto":f};W=Ga||aa;if(c.expr&&c.expr.filters){c.expr.filters.hidden=function(a){var b=a.offsetHeight;return a.offsetWidth===0&&b===0||!c.support.reliableHiddenOffsets&&(a.style.display||c.css(a,"display"))==="none"};c.expr.filters.visible=function(a){return!c.expr.filters.hidden(a)}}var mb=c.now(),nb=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,
+ob=/^(?:select|textarea)/i,pb=/^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,qb=/^(?:GET|HEAD)$/,Ra=/\[\]$/,T=/\=\?(&|$)/,ja=/\?/,rb=/([?&])_=[^&]*/,sb=/^(\w+:)?\/\/([^\/?#]+)/,tb=/%20/g,ub=/#.*$/,Ha=c.fn.load;c.fn.extend({load:function(a,b,d){if(typeof a!=="string"&&Ha)return Ha.apply(this,arguments);else if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var f=a.slice(e,a.length);a=a.slice(0,e)}e="GET";if(b)if(c.isFunction(b)){d=b;b=null}else if(typeof b===
+"object"){b=c.param(b,c.ajaxSettings.traditional);e="POST"}var h=this;c.ajax({url:a,type:e,dataType:"html",data:b,complete:function(l,k){if(k==="success"||k==="notmodified")h.html(f?c("<div>").append(l.responseText.replace(nb,"")).find(f):l.responseText);d&&h.each(d,[l.responseText,k,l])}});return this},serialize:function(){return c.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?c.makeArray(this.elements):this}).filter(function(){return this.name&&
+!this.disabled&&(this.checked||ob.test(this.nodeName)||pb.test(this.type))}).map(function(a,b){var d=c(this).val();return d==null?null:c.isArray(d)?c.map(d,function(e){return{name:b.name,value:e}}):{name:b.name,value:d}}).get()}});c.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){c.fn[b]=function(d){return this.bind(b,d)}});c.extend({get:function(a,b,d,e){if(c.isFunction(b)){e=e||d;d=b;b=null}return c.ajax({type:"GET",url:a,data:b,success:d,dataType:e})},
+getScript:function(a,b){return c.get(a,null,b,"script")},getJSON:function(a,b,d){return c.get(a,b,d,"json")},post:function(a,b,d,e){if(c.isFunction(b)){e=e||d;d=b;b={}}return c.ajax({type:"POST",url:a,data:b,success:d,dataType:e})},ajaxSetup:function(a){c.extend(c.ajaxSettings,a)},ajaxSettings:{url:location.href,global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:function(){return new E.XMLHttpRequest},accepts:{xml:"application/xml, text/xml",html:"text/html",
+script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},ajax:function(a){var b=c.extend(true,{},c.ajaxSettings,a),d,e,f,h=b.type.toUpperCase(),l=qb.test(h);b.url=b.url.replace(ub,"");b.context=a&&a.context!=null?a.context:b;if(b.data&&b.processData&&typeof b.data!=="string")b.data=c.param(b.data,b.traditional);if(b.dataType==="jsonp"){if(h==="GET")T.test(b.url)||(b.url+=(ja.test(b.url)?"&":"?")+(b.jsonp||"callback")+"=?");else if(!b.data||
+!T.test(b.data))b.data=(b.data?b.data+"&":"")+(b.jsonp||"callback")+"=?";b.dataType="json"}if(b.dataType==="json"&&(b.data&&T.test(b.data)||T.test(b.url))){d=b.jsonpCallback||"jsonp"+mb++;if(b.data)b.data=(b.data+"").replace(T,"="+d+"$1");b.url=b.url.replace(T,"="+d+"$1");b.dataType="script";var k=E[d];E[d]=function(m){if(c.isFunction(k))k(m);else{E[d]=B;try{delete E[d]}catch(p){}}f=m;c.handleSuccess(b,w,e,f);c.handleComplete(b,w,e,f);r&&r.removeChild(A)}}if(b.dataType==="script"&&b.cache===null)b.cache=
+false;if(b.cache===false&&l){var o=c.now(),x=b.url.replace(rb,"$1_="+o);b.url=x+(x===b.url?(ja.test(b.url)?"&":"?")+"_="+o:"")}if(b.data&&l)b.url+=(ja.test(b.url)?"&":"?")+b.data;b.global&&c.active++===0&&c.event.trigger("ajaxStart");o=(o=sb.exec(b.url))&&(o[1]&&o[1].toLowerCase()!==location.protocol||o[2].toLowerCase()!==location.host);if(b.dataType==="script"&&h==="GET"&&o){var r=t.getElementsByTagName("head")[0]||t.documentElement,A=t.createElement("script");if(b.scriptCharset)A.charset=b.scriptCharset;
+A.src=b.url;if(!d){var C=false;A.onload=A.onreadystatechange=function(){if(!C&&(!this.readyState||this.readyState==="loaded"||this.readyState==="complete")){C=true;c.handleSuccess(b,w,e,f);c.handleComplete(b,w,e,f);A.onload=A.onreadystatechange=null;r&&A.parentNode&&r.removeChild(A)}}}r.insertBefore(A,r.firstChild);return B}var J=false,w=b.xhr();if(w){b.username?w.open(h,b.url,b.async,b.username,b.password):w.open(h,b.url,b.async);try{if(b.data!=null&&!l||a&&a.contentType)w.setRequestHeader("Content-Type",
+b.contentType);if(b.ifModified){c.lastModified[b.url]&&w.setRequestHeader("If-Modified-Since",c.lastModified[b.url]);c.etag[b.url]&&w.setRequestHeader("If-None-Match",c.etag[b.url])}o||w.setRequestHeader("X-Requested-With","XMLHttpRequest");w.setRequestHeader("Accept",b.dataType&&b.accepts[b.dataType]?b.accepts[b.dataType]+", */*; q=0.01":b.accepts._default)}catch(I){}if(b.beforeSend&&b.beforeSend.call(b.context,w,b)===false){b.global&&c.active--===1&&c.event.trigger("ajaxStop");w.abort();return false}b.global&&
+c.triggerGlobal(b,"ajaxSend",[w,b]);var L=w.onreadystatechange=function(m){if(!w||w.readyState===0||m==="abort"){J||c.handleComplete(b,w,e,f);J=true;if(w)w.onreadystatechange=c.noop}else if(!J&&w&&(w.readyState===4||m==="timeout")){J=true;w.onreadystatechange=c.noop;e=m==="timeout"?"timeout":!c.httpSuccess(w)?"error":b.ifModified&&c.httpNotModified(w,b.url)?"notmodified":"success";var p;if(e==="success")try{f=c.httpData(w,b.dataType,b)}catch(q){e="parsererror";p=q}if(e==="success"||e==="notmodified")d||
+c.handleSuccess(b,w,e,f);else c.handleError(b,w,e,p);d||c.handleComplete(b,w,e,f);m==="timeout"&&w.abort();if(b.async)w=null}};try{var g=w.abort;w.abort=function(){w&&Function.prototype.call.call(g,w);L("abort")}}catch(i){}b.async&&b.timeout>0&&setTimeout(function(){w&&!J&&L("timeout")},b.timeout);try{w.send(l||b.data==null?null:b.data)}catch(n){c.handleError(b,w,null,n);c.handleComplete(b,w,e,f)}b.async||L();return w}},param:function(a,b){var d=[],e=function(h,l){l=c.isFunction(l)?l():l;d[d.length]=
+encodeURIComponent(h)+"="+encodeURIComponent(l)};if(b===B)b=c.ajaxSettings.traditional;if(c.isArray(a)||a.jquery)c.each(a,function(){e(this.name,this.value)});else for(var f in a)da(f,a[f],b,e);return d.join("&").replace(tb,"+")}});c.extend({active:0,lastModified:{},etag:{},handleError:function(a,b,d,e){a.error&&a.error.call(a.context,b,d,e);a.global&&c.triggerGlobal(a,"ajaxError",[b,a,e])},handleSuccess:function(a,b,d,e){a.success&&a.success.call(a.context,e,d,b);a.global&&c.triggerGlobal(a,"ajaxSuccess",
+[b,a])},handleComplete:function(a,b,d){a.complete&&a.complete.call(a.context,b,d);a.global&&c.triggerGlobal(a,"ajaxComplete",[b,a]);a.global&&c.active--===1&&c.event.trigger("ajaxStop")},triggerGlobal:function(a,b,d){(a.context&&a.context.url==null?c(a.context):c.event).trigger(b,d)},httpSuccess:function(a){try{return!a.status&&location.protocol==="file:"||a.status>=200&&a.status<300||a.status===304||a.status===1223}catch(b){}return false},httpNotModified:function(a,b){var d=a.getResponseHeader("Last-Modified"),
+e=a.getResponseHeader("Etag");if(d)c.lastModified[b]=d;if(e)c.etag[b]=e;return a.status===304},httpData:function(a,b,d){var e=a.getResponseHeader("content-type")||"",f=b==="xml"||!b&&e.indexOf("xml")>=0;a=f?a.responseXML:a.responseText;f&&a.documentElement.nodeName==="parsererror"&&c.error("parsererror");if(d&&d.dataFilter)a=d.dataFilter(a,b);if(typeof a==="string")if(b==="json"||!b&&e.indexOf("json")>=0)a=c.parseJSON(a);else if(b==="script"||!b&&e.indexOf("javascript")>=0)c.globalEval(a);return a}});
+if(E.ActiveXObject)c.ajaxSettings.xhr=function(){if(E.location.protocol!=="file:")try{return new E.XMLHttpRequest}catch(a){}try{return new E.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}};c.support.ajax=!!c.ajaxSettings.xhr();var ea={},vb=/^(?:toggle|show|hide)$/,wb=/^([+\-]=)?([\d+.\-]+)(.*)$/,ba,pa=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];c.fn.extend({show:function(a,b,d){if(a||a===0)return this.animate(S("show",
+3),a,b,d);else{d=0;for(var e=this.length;d<e;d++){a=this[d];b=a.style.display;if(!c.data(a,"olddisplay")&&b==="none")b=a.style.display="";b===""&&c.css(a,"display")==="none"&&c.data(a,"olddisplay",qa(a.nodeName))}for(d=0;d<e;d++){a=this[d];b=a.style.display;if(b===""||b==="none")a.style.display=c.data(a,"olddisplay")||""}return this}},hide:function(a,b,d){if(a||a===0)return this.animate(S("hide",3),a,b,d);else{a=0;for(b=this.length;a<b;a++){d=c.css(this[a],"display");d!=="none"&&c.data(this[a],"olddisplay",
+d)}for(a=0;a<b;a++)this[a].style.display="none";return this}},_toggle:c.fn.toggle,toggle:function(a,b,d){var e=typeof a==="boolean";if(c.isFunction(a)&&c.isFunction(b))this._toggle.apply(this,arguments);else a==null||e?this.each(function(){var f=e?a:c(this).is(":hidden");c(this)[f?"show":"hide"]()}):this.animate(S("toggle",3),a,b,d);return this},fadeTo:function(a,b,d,e){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,d,e)},animate:function(a,b,d,e){var f=c.speed(b,
+d,e);if(c.isEmptyObject(a))return this.each(f.complete);return this[f.queue===false?"each":"queue"](function(){var h=c.extend({},f),l,k=this.nodeType===1,o=k&&c(this).is(":hidden"),x=this;for(l in a){var r=c.camelCase(l);if(l!==r){a[r]=a[l];delete a[l];l=r}if(a[l]==="hide"&&o||a[l]==="show"&&!o)return h.complete.call(this);if(k&&(l==="height"||l==="width")){h.overflow=[this.style.overflow,this.style.overflowX,this.style.overflowY];if(c.css(this,"display")==="inline"&&c.css(this,"float")==="none")if(c.support.inlineBlockNeedsLayout)if(qa(this.nodeName)===
+"inline")this.style.display="inline-block";else{this.style.display="inline";this.style.zoom=1}else this.style.display="inline-block"}if(c.isArray(a[l])){(h.specialEasing=h.specialEasing||{})[l]=a[l][1];a[l]=a[l][0]}}if(h.overflow!=null)this.style.overflow="hidden";h.curAnim=c.extend({},a);c.each(a,function(A,C){var J=new c.fx(x,h,A);if(vb.test(C))J[C==="toggle"?o?"show":"hide":C](a);else{var w=wb.exec(C),I=J.cur()||0;if(w){var L=parseFloat(w[2]),g=w[3]||"px";if(g!=="px"){c.style(x,A,(L||1)+g);I=(L||
+1)/J.cur()*I;c.style(x,A,I+g)}if(w[1])L=(w[1]==="-="?-1:1)*L+I;J.custom(I,L,g)}else J.custom(I,C,"")}});return true})},stop:function(a,b){var d=c.timers;a&&this.queue([]);this.each(function(){for(var e=d.length-1;e>=0;e--)if(d[e].elem===this){b&&d[e](true);d.splice(e,1)}});b||this.dequeue();return this}});c.each({slideDown:S("show",1),slideUp:S("hide",1),slideToggle:S("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){c.fn[a]=function(d,e,f){return this.animate(b,
+d,e,f)}});c.extend({speed:function(a,b,d){var e=a&&typeof a==="object"?c.extend({},a):{complete:d||!d&&b||c.isFunction(a)&&a,duration:a,easing:d&&b||b&&!c.isFunction(b)&&b};e.duration=c.fx.off?0:typeof e.duration==="number"?e.duration:e.duration in c.fx.speeds?c.fx.speeds[e.duration]:c.fx.speeds._default;e.old=e.complete;e.complete=function(){e.queue!==false&&c(this).dequeue();c.isFunction(e.old)&&e.old.call(this)};return e},easing:{linear:function(a,b,d,e){return d+e*a},swing:function(a,b,d,e){return(-Math.cos(a*
+Math.PI)/2+0.5)*e+d}},timers:[],fx:function(a,b,d){this.options=b;this.elem=a;this.prop=d;if(!b.orig)b.orig={}}});c.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this);(c.fx.step[this.prop]||c.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=parseFloat(c.css(this.elem,this.prop));return a&&a>-1E4?a:0},custom:function(a,b,d){function e(l){return f.step(l)}
+var f=this,h=c.fx;this.startTime=c.now();this.start=a;this.end=b;this.unit=d||this.unit||"px";this.now=this.start;this.pos=this.state=0;e.elem=this.elem;if(e()&&c.timers.push(e)&&!ba)ba=setInterval(h.tick,h.interval)},show:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.show=true;this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur());c(this.elem).show()},hide:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.hide=true;
+this.custom(this.cur(),0)},step:function(a){var b=c.now(),d=true;if(a||b>=this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;for(var e in this.options.curAnim)if(this.options.curAnim[e]!==true)d=false;if(d){if(this.options.overflow!=null&&!c.support.shrinkWrapBlocks){var f=this.elem,h=this.options;c.each(["","X","Y"],function(k,o){f.style["overflow"+o]=h.overflow[k]})}this.options.hide&&c(this.elem).hide();if(this.options.hide||
+this.options.show)for(var l in this.options.curAnim)c.style(this.elem,l,this.options.orig[l]);this.options.complete.call(this.elem)}return false}else{a=b-this.startTime;this.state=a/this.options.duration;b=this.options.easing||(c.easing.swing?"swing":"linear");this.pos=c.easing[this.options.specialEasing&&this.options.specialEasing[this.prop]||b](this.state,a,0,1,this.options.duration);this.now=this.start+(this.end-this.start)*this.pos;this.update()}return true}};c.extend(c.fx,{tick:function(){for(var a=
+c.timers,b=0;b<a.length;b++)a[b]()||a.splice(b--,1);a.length||c.fx.stop()},interval:13,stop:function(){clearInterval(ba);ba=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){c.style(a.elem,"opacity",a.now)},_default:function(a){if(a.elem.style&&a.elem.style[a.prop]!=null)a.elem.style[a.prop]=(a.prop==="width"||a.prop==="height"?Math.max(0,a.now):a.now)+a.unit;else a.elem[a.prop]=a.now}}});if(c.expr&&c.expr.filters)c.expr.filters.animated=function(a){return c.grep(c.timers,function(b){return a===
+b.elem}).length};var xb=/^t(?:able|d|h)$/i,Ia=/^(?:body|html)$/i;c.fn.offset="getBoundingClientRect"in t.documentElement?function(a){var b=this[0],d;if(a)return this.each(function(l){c.offset.setOffset(this,a,l)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return c.offset.bodyOffset(b);try{d=b.getBoundingClientRect()}catch(e){}var f=b.ownerDocument,h=f.documentElement;if(!d||!c.contains(h,b))return d||{top:0,left:0};b=f.body;f=fa(f);return{top:d.top+(f.pageYOffset||c.support.boxModel&&
+h.scrollTop||b.scrollTop)-(h.clientTop||b.clientTop||0),left:d.left+(f.pageXOffset||c.support.boxModel&&h.scrollLeft||b.scrollLeft)-(h.clientLeft||b.clientLeft||0)}}:function(a){var b=this[0];if(a)return this.each(function(x){c.offset.setOffset(this,a,x)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return c.offset.bodyOffset(b);c.offset.initialize();var d,e=b.offsetParent,f=b.ownerDocument,h=f.documentElement,l=f.body;d=(f=f.defaultView)?f.getComputedStyle(b,null):b.currentStyle;
+for(var k=b.offsetTop,o=b.offsetLeft;(b=b.parentNode)&&b!==l&&b!==h;){if(c.offset.supportsFixedPosition&&d.position==="fixed")break;d=f?f.getComputedStyle(b,null):b.currentStyle;k-=b.scrollTop;o-=b.scrollLeft;if(b===e){k+=b.offsetTop;o+=b.offsetLeft;if(c.offset.doesNotAddBorder&&!(c.offset.doesAddBorderForTableAndCells&&xb.test(b.nodeName))){k+=parseFloat(d.borderTopWidth)||0;o+=parseFloat(d.borderLeftWidth)||0}e=b.offsetParent}if(c.offset.subtractsBorderForOverflowNotVisible&&d.overflow!=="visible"){k+=
+parseFloat(d.borderTopWidth)||0;o+=parseFloat(d.borderLeftWidth)||0}d=d}if(d.position==="relative"||d.position==="static"){k+=l.offsetTop;o+=l.offsetLeft}if(c.offset.supportsFixedPosition&&d.position==="fixed"){k+=Math.max(h.scrollTop,l.scrollTop);o+=Math.max(h.scrollLeft,l.scrollLeft)}return{top:k,left:o}};c.offset={initialize:function(){var a=t.body,b=t.createElement("div"),d,e,f,h=parseFloat(c.css(a,"marginTop"))||0;c.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",
+height:"1px",visibility:"hidden"});b.innerHTML="<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";a.insertBefore(b,a.firstChild);d=b.firstChild;e=d.firstChild;f=d.nextSibling.firstChild.firstChild;this.doesNotAddBorder=e.offsetTop!==5;this.doesAddBorderForTableAndCells=
+f.offsetTop===5;e.style.position="fixed";e.style.top="20px";this.supportsFixedPosition=e.offsetTop===20||e.offsetTop===15;e.style.position=e.style.top="";d.style.overflow="hidden";d.style.position="relative";this.subtractsBorderForOverflowNotVisible=e.offsetTop===-5;this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==h;a.removeChild(b);c.offset.initialize=c.noop},bodyOffset:function(a){var b=a.offsetTop,d=a.offsetLeft;c.offset.initialize();if(c.offset.doesNotIncludeMarginInBodyOffset){b+=parseFloat(c.css(a,
+"marginTop"))||0;d+=parseFloat(c.css(a,"marginLeft"))||0}return{top:b,left:d}},setOffset:function(a,b,d){var e=c.css(a,"position");if(e==="static")a.style.position="relative";var f=c(a),h=f.offset(),l=c.css(a,"top"),k=c.css(a,"left"),o=e==="absolute"&&c.inArray("auto",[l,k])>-1;e={};var x={};if(o)x=f.position();l=o?x.top:parseInt(l,10)||0;k=o?x.left:parseInt(k,10)||0;if(c.isFunction(b))b=b.call(a,d,h);if(b.top!=null)e.top=b.top-h.top+l;if(b.left!=null)e.left=b.left-h.left+k;"using"in b?b.using.call(a,
+e):f.css(e)}};c.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),d=this.offset(),e=Ia.test(b[0].nodeName)?{top:0,left:0}:b.offset();d.top-=parseFloat(c.css(a,"marginTop"))||0;d.left-=parseFloat(c.css(a,"marginLeft"))||0;e.top+=parseFloat(c.css(b[0],"borderTopWidth"))||0;e.left+=parseFloat(c.css(b[0],"borderLeftWidth"))||0;return{top:d.top-e.top,left:d.left-e.left}},offsetParent:function(){return this.map(function(){for(var a=this.offsetParent||t.body;a&&!Ia.test(a.nodeName)&&
+c.css(a,"position")==="static";)a=a.offsetParent;return a})}});c.each(["Left","Top"],function(a,b){var d="scroll"+b;c.fn[d]=function(e){var f=this[0],h;if(!f)return null;if(e!==B)return this.each(function(){if(h=fa(this))h.scrollTo(!a?e:c(h).scrollLeft(),a?e:c(h).scrollTop());else this[d]=e});else return(h=fa(f))?"pageXOffset"in h?h[a?"pageYOffset":"pageXOffset"]:c.support.boxModel&&h.document.documentElement[d]||h.document.body[d]:f[d]}});c.each(["Height","Width"],function(a,b){var d=b.toLowerCase();
+c.fn["inner"+b]=function(){return this[0]?parseFloat(c.css(this[0],d,"padding")):null};c.fn["outer"+b]=function(e){return this[0]?parseFloat(c.css(this[0],d,e?"margin":"border")):null};c.fn[d]=function(e){var f=this[0];if(!f)return e==null?null:this;if(c.isFunction(e))return this.each(function(l){var k=c(this);k[d](e.call(this,l,k[d]()))});if(c.isWindow(f))return f.document.compatMode==="CSS1Compat"&&f.document.documentElement["client"+b]||f.document.body["client"+b];else if(f.nodeType===9)return Math.max(f.documentElement["client"+
+b],f.body["scroll"+b],f.documentElement["scroll"+b],f.body["offset"+b],f.documentElement["offset"+b]);else if(e===B){f=c.css(f,d);var h=parseFloat(f);return c.isNaN(h)?f:h}else return this.css(d,typeof e==="string"?e:e+"px")}})})(window);
\ No newline at end of file
diff --git a/samples/Cellar/CellarServer/Content/scripts/jquery.reveal.js b/samples/Cellar/CellarServer/Content/scripts/jquery.reveal.js
new file mode 100644
index 000000000..9140d48b4
--- /dev/null
+++ b/samples/Cellar/CellarServer/Content/scripts/jquery.reveal.js
@@ -0,0 +1,160 @@
+/*
+ * jQuery Reveal Plugin 1.0
+ * www.ZURB.com
+ * Copyright 2010, ZURB
+ * Free to use under the MIT license.
+ * http://www.opensource.org/licenses/mit-license.php
+*/
+
+
+(function($) {
+
+/*---------------------------
+ Defaults for Reveal
+----------------------------*/
+	 
+/*---------------------------
+ Listener for data-reveal-id attributes
+----------------------------*/
+
+	$('a[data-reveal-id]').live('click', function(e) {
+		e.preventDefault();
+		var modalLocation = $(this).attr('data-reveal-id');
+		$('#'+modalLocation).reveal($(this).data());
+	});
+
+/*---------------------------
+ Extend and Execute
+----------------------------*/
+
+    $.fn.reveal = function(options) {
+        
+        
+        var defaults = {  
+	    	animation: 'fadeAndPop', //fade, fadeAndPop, none
+		    animationspeed: 300, //how fast animtions are
+		    closeonbackgroundclick: true, //if you click background will modal close?
+		    dismissmodalclass: 'close-reveal-modal' //the class of a button or element that will close an open modal
+    	}; 
+    	
+        //Extend dem' options
+        var options = $.extend({}, defaults, options); 
+	
+        return this.each(function() {
+        
+/*---------------------------
+ Global Variables
+----------------------------*/
+        	var modal = $(this),
+        		topMeasure  = parseInt(modal.css('top')),
+				topOffset = modal.height() + topMeasure,
+          		locked = false,
+				modalBG = $('.reveal-modal-bg');
+
+/*---------------------------
+ Create Modal BG
+----------------------------*/
+			if(modalBG.length == 0) {
+				modalBG = $('<div class="reveal-modal-bg" />').insertAfter(modal);
+			}		    
+     
+/*---------------------------
+ Open & Close Animations
+----------------------------*/
+			//Entrance Animations
+			modal.bind('reveal:open', function () {
+			  modalBG.unbind('click.modalEvent');
+				$('.' + options.dismissmodalclass).unbind('click.modalEvent');
+				if(!locked) {
+					lockModal();
+					if(options.animation == "fadeAndPop") {
+						modal.css({'top': $(document).scrollTop()-topOffset, 'opacity' : 0, 'visibility' : 'visible'});
+						modalBG.fadeIn(options.animationspeed/2);
+						modal.delay(options.animationspeed/2).animate({
+							"top": $(document).scrollTop()+topMeasure + 'px',
+							"opacity" : 1
+						}, options.animationspeed,unlockModal());					
+					}
+					if(options.animation == "fade") {
+						modal.css({'opacity' : 0, 'visibility' : 'visible', 'top': $(document).scrollTop()+topMeasure});
+						modalBG.fadeIn(options.animationspeed/2);
+						modal.delay(options.animationspeed/2).animate({
+							"opacity" : 1
+						}, options.animationspeed,unlockModal());					
+					} 
+					if(options.animation == "none") {
+						modal.css({'visibility' : 'visible', 'top':$(document).scrollTop()+topMeasure});
+						modalBG.css({"display":"block"});	
+						unlockModal()				
+					}
+				}
+				modal.unbind('reveal:open');
+			}); 	
+
+			//Closing Animation
+			modal.bind('reveal:close', function () {
+			  if(!locked) {
+					lockModal();
+					if(options.animation == "fadeAndPop") {
+						modalBG.delay(options.animationspeed).fadeOut(options.animationspeed);
+						modal.animate({
+							"top":  $(document).scrollTop()-topOffset + 'px',
+							"opacity" : 0
+						}, options.animationspeed/2, function() {
+							modal.css({'top':topMeasure, 'opacity' : 1, 'visibility' : 'hidden'});
+							unlockModal();
+						});					
+					}  	
+					if(options.animation == "fade") {
+						modalBG.delay(options.animationspeed).fadeOut(options.animationspeed);
+						modal.animate({
+							"opacity" : 0
+						}, options.animationspeed, function() {
+							modal.css({'opacity' : 1, 'visibility' : 'hidden', 'top' : topMeasure});
+							unlockModal();
+						});					
+					}  	
+					if(options.animation == "none") {
+						modal.css({'visibility' : 'hidden', 'top' : topMeasure});
+						modalBG.css({'display' : 'none'});	
+					}		
+				}
+				modal.unbind('reveal:close');
+			});     
+   	
+/*---------------------------
+ Open and add Closing Listeners
+----------------------------*/
+        	//Open Modal Immediately
+    	modal.trigger('reveal:open')
+			
+			//Close Modal Listeners
+			var closeButton = $('.' + options.dismissmodalclass).bind('click.modalEvent', function () {
+			  modal.trigger('reveal:close')
+			});
+			
+			if(options.closeonbackgroundclick) {
+				modalBG.css({"cursor":"pointer"})
+				modalBG.bind('click.modalEvent', function () {
+				  modal.trigger('reveal:close')
+				});
+			}
+			$('body').keyup(function(e) {
+        		if(e.which===27){ modal.trigger('reveal:close'); } // 27 is the keycode for the Escape key
+			});
+			
+			
+/*---------------------------
+ Animations Locks
+----------------------------*/
+			function unlockModal() { 
+				locked = false;
+			}
+			function lockModal() {
+				locked = true;
+			}	
+			
+        });//each call
+    }//orbit plugin call
+})(jQuery);
+        
diff --git a/samples/Cellar/CellarServer/Content/scripts/knockout-2.1.0.js b/samples/Cellar/CellarServer/Content/scripts/knockout-2.1.0.js
new file mode 100644
index 000000000..107026da1
--- /dev/null
+++ b/samples/Cellar/CellarServer/Content/scripts/knockout-2.1.0.js
@@ -0,0 +1,86 @@
+// Knockout JavaScript library v2.1.0
+// (c) Steven Sanderson - http://knockoutjs.com/
+// License: MIT (http://www.opensource.org/licenses/mit-license.php)
+
+(function(window,document,navigator,undefined){
+function m(w){throw w;}var n=void 0,p=!0,s=null,t=!1;function A(w){return function(){return w}};function E(w){function B(b,c,d){d&&c!==a.k.r(b)&&a.k.S(b,c);c!==a.k.r(b)&&a.a.va(b,"change")}var a="undefined"!==typeof w?w:{};a.b=function(b,c){for(var d=b.split("."),f=a,g=0;g<d.length-1;g++)f=f[d[g]];f[d[d.length-1]]=c};a.B=function(a,c,d){a[c]=d};a.version="2.1.0";a.b("version",a.version);a.a=new function(){function b(b,c){if("input"!==a.a.o(b)||!b.type||"click"!=c.toLowerCase())return t;var e=b.type;return"checkbox"==e||"radio"==e}var c=/^(\s|\u00A0)+|(\s|\u00A0)+$/g,d={},f={};d[/Firefox\/2/i.test(navigator.userAgent)?
+"KeyboardEvent":"UIEvents"]=["keyup","keydown","keypress"];d.MouseEvents="click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave".split(" ");for(var g in d){var e=d[g];if(e.length)for(var h=0,j=e.length;h<j;h++)f[e[h]]=g}var k={propertychange:p},i=function(){for(var a=3,b=document.createElement("div"),c=b.getElementsByTagName("i");b.innerHTML="<\!--[if gt IE "+ ++a+"]><i></i><![endif]--\>",c[0];);return 4<a?a:n}();return{Ca:["authenticity_token",/^__RequestVerificationToken(_.*)?$/],
+v:function(a,b){for(var c=0,e=a.length;c<e;c++)b(a[c])},j:function(a,b){if("function"==typeof Array.prototype.indexOf)return Array.prototype.indexOf.call(a,b);for(var c=0,e=a.length;c<e;c++)if(a[c]===b)return c;return-1},ab:function(a,b,c){for(var e=0,f=a.length;e<f;e++)if(b.call(c,a[e]))return a[e];return s},ba:function(b,c){var e=a.a.j(b,c);0<=e&&b.splice(e,1)},za:function(b){for(var b=b||[],c=[],e=0,f=b.length;e<f;e++)0>a.a.j(c,b[e])&&c.push(b[e]);return c},T:function(a,b){for(var a=a||[],c=[],
+e=0,f=a.length;e<f;e++)c.push(b(a[e]));return c},aa:function(a,b){for(var a=a||[],c=[],e=0,f=a.length;e<f;e++)b(a[e])&&c.push(a[e]);return c},N:function(a,b){if(b instanceof Array)a.push.apply(a,b);else for(var c=0,e=b.length;c<e;c++)a.push(b[c]);return a},extend:function(a,b){if(b)for(var c in b)b.hasOwnProperty(c)&&(a[c]=b[c]);return a},ga:function(b){for(;b.firstChild;)a.removeNode(b.firstChild)},Ab:function(b){for(var b=a.a.L(b),c=document.createElement("div"),e=0,f=b.length;e<f;e++)a.F(b[e]),
+c.appendChild(b[e]);return c},X:function(b,c){a.a.ga(b);if(c)for(var e=0,f=c.length;e<f;e++)b.appendChild(c[e])},Na:function(b,c){var e=b.nodeType?[b]:b;if(0<e.length){for(var f=e[0],d=f.parentNode,g=0,h=c.length;g<h;g++)d.insertBefore(c[g],f);g=0;for(h=e.length;g<h;g++)a.removeNode(e[g])}},Pa:function(a,b){0<=navigator.userAgent.indexOf("MSIE 6")?a.setAttribute("selected",b):a.selected=b},w:function(a){return(a||"").replace(c,"")},Ib:function(b,c){for(var e=[],f=(b||"").split(c),g=0,d=f.length;g<
+d;g++){var h=a.a.w(f[g]);""!==h&&e.push(h)}return e},Hb:function(a,b){a=a||"";return b.length>a.length?t:a.substring(0,b.length)===b},eb:function(a,b){for(var c="return ("+a+")",e=0;e<b;e++)c="with(sc["+e+"]) { "+c+" } ";return new Function("sc",c)},kb:function(a,b){if(b.compareDocumentPosition)return 16==(b.compareDocumentPosition(a)&16);for(;a!=s;){if(a==b)return p;a=a.parentNode}return t},fa:function(b){return a.a.kb(b,b.ownerDocument)},o:function(a){return a&&a.tagName&&a.tagName.toLowerCase()},
+n:function(a,c,e){var f=i&&k[c];if(!f&&"undefined"!=typeof jQuery){if(b(a,c))var g=e,e=function(a,b){var c=this.checked;b&&(this.checked=b.fb!==p);g.call(this,a);this.checked=c};jQuery(a).bind(c,e)}else!f&&"function"==typeof a.addEventListener?a.addEventListener(c,e,t):"undefined"!=typeof a.attachEvent?a.attachEvent("on"+c,function(b){e.call(a,b)}):m(Error("Browser doesn't support addEventListener or attachEvent"))},va:function(a,c){(!a||!a.nodeType)&&m(Error("element must be a DOM node when calling triggerEvent"));
+if("undefined"!=typeof jQuery){var e=[];b(a,c)&&e.push({fb:a.checked});jQuery(a).trigger(c,e)}else"function"==typeof document.createEvent?"function"==typeof a.dispatchEvent?(e=document.createEvent(f[c]||"HTMLEvents"),e.initEvent(c,p,p,window,0,0,0,0,0,t,t,t,t,0,a),a.dispatchEvent(e)):m(Error("The supplied element doesn't support dispatchEvent")):"undefined"!=typeof a.fireEvent?(b(a,c)&&(a.checked=a.checked!==p),a.fireEvent("on"+c)):m(Error("Browser doesn't support triggering events"))},d:function(b){return a.la(b)?
+b():b},Ua:function(b,c,e){var f=(b.className||"").split(/\s+/),g=0<=a.a.j(f,c);if(e&&!g)b.className+=(f[0]?" ":"")+c;else if(g&&!e){e="";for(g=0;g<f.length;g++)f[g]!=c&&(e+=f[g]+" ");b.className=a.a.w(e)}},Qa:function(b,c){var e=a.a.d(c);if(e===s||e===n)e="";"innerText"in b?b.innerText=e:b.textContent=e;9<=i&&(b.style.display=b.style.display)},lb:function(a){if(9<=i){var b=a.style.width;a.style.width=0;a.style.width=b}},Eb:function(b,e){for(var b=a.a.d(b),e=a.a.d(e),c=[],f=b;f<=e;f++)c.push(f);return c},
+L:function(a){for(var b=[],e=0,c=a.length;e<c;e++)b.push(a[e]);return b},tb:6===i,ub:7===i,ja:i,Da:function(b,e){for(var c=a.a.L(b.getElementsByTagName("input")).concat(a.a.L(b.getElementsByTagName("textarea"))),f="string"==typeof e?function(a){return a.name===e}:function(a){return e.test(a.name)},g=[],d=c.length-1;0<=d;d--)f(c[d])&&g.push(c[d]);return g},Bb:function(b){return"string"==typeof b&&(b=a.a.w(b))?window.JSON&&window.JSON.parse?window.JSON.parse(b):(new Function("return "+b))():s},sa:function(b,
+e,c){("undefined"==typeof JSON||"undefined"==typeof JSON.stringify)&&m(Error("Cannot find JSON.stringify(). Some browsers (e.g., IE < 8) don't support it natively, but you can overcome this by adding a script reference to json2.js, downloadable from http://www.json.org/json2.js"));return JSON.stringify(a.a.d(b),e,c)},Cb:function(b,e,c){var c=c||{},f=c.params||{},g=c.includeFields||this.Ca,d=b;if("object"==typeof b&&"form"===a.a.o(b))for(var d=b.action,h=g.length-1;0<=h;h--)for(var k=a.a.Da(b,g[h]),
+j=k.length-1;0<=j;j--)f[k[j].name]=k[j].value;var e=a.a.d(e),i=document.createElement("form");i.style.display="none";i.action=d;i.method="post";for(var z in e)b=document.createElement("input"),b.name=z,b.value=a.a.sa(a.a.d(e[z])),i.appendChild(b);for(z in f)b=document.createElement("input"),b.name=z,b.value=f[z],i.appendChild(b);document.body.appendChild(i);c.submitter?c.submitter(i):i.submit();setTimeout(function(){i.parentNode.removeChild(i)},0)}}};a.b("utils",a.a);a.b("utils.arrayForEach",a.a.v);
+a.b("utils.arrayFirst",a.a.ab);a.b("utils.arrayFilter",a.a.aa);a.b("utils.arrayGetDistinctValues",a.a.za);a.b("utils.arrayIndexOf",a.a.j);a.b("utils.arrayMap",a.a.T);a.b("utils.arrayPushAll",a.a.N);a.b("utils.arrayRemoveItem",a.a.ba);a.b("utils.extend",a.a.extend);a.b("utils.fieldsIncludedWithJsonPost",a.a.Ca);a.b("utils.getFormFields",a.a.Da);a.b("utils.postJson",a.a.Cb);a.b("utils.parseJson",a.a.Bb);a.b("utils.registerEventHandler",a.a.n);a.b("utils.stringifyJson",a.a.sa);a.b("utils.range",a.a.Eb);
+a.b("utils.toggleDomNodeCssClass",a.a.Ua);a.b("utils.triggerEvent",a.a.va);a.b("utils.unwrapObservable",a.a.d);Function.prototype.bind||(Function.prototype.bind=function(a){var c=this,d=Array.prototype.slice.call(arguments),a=d.shift();return function(){return c.apply(a,d.concat(Array.prototype.slice.call(arguments)))}});a.a.f=new function(){var b=0,c="__ko__"+(new Date).getTime(),d={};return{get:function(b,c){var e=a.a.f.getAll(b,t);return e===n?n:e[c]},set:function(b,c,e){e===n&&a.a.f.getAll(b,
+t)===n||(a.a.f.getAll(b,p)[c]=e)},getAll:function(a,g){var e=a[c];if(!(e&&"null"!==e)){if(!g)return;e=a[c]="ko"+b++;d[e]={}}return d[e]},clear:function(a){var b=a[c];b&&(delete d[b],a[c]=s)}}};a.b("utils.domData",a.a.f);a.b("utils.domData.clear",a.a.f.clear);a.a.G=new function(){function b(b,c){var f=a.a.f.get(b,d);f===n&&c&&(f=[],a.a.f.set(b,d,f));return f}function c(e){var f=b(e,t);if(f)for(var f=f.slice(0),d=0;d<f.length;d++)f[d](e);a.a.f.clear(e);"function"==typeof jQuery&&"function"==typeof jQuery.cleanData&&
+jQuery.cleanData([e]);if(g[e.nodeType])for(f=e.firstChild;e=f;)f=e.nextSibling,8===e.nodeType&&c(e)}var d="__ko_domNodeDisposal__"+(new Date).getTime(),f={1:p,8:p,9:p},g={1:p,9:p};return{wa:function(a,c){"function"!=typeof c&&m(Error("Callback must be a function"));b(a,p).push(c)},Ma:function(c,f){var g=b(c,t);g&&(a.a.ba(g,f),0==g.length&&a.a.f.set(c,d,n))},F:function(b){if(f[b.nodeType]&&(c(b),g[b.nodeType])){var d=[];a.a.N(d,b.getElementsByTagName("*"));for(var b=0,j=d.length;b<j;b++)c(d[b])}},
+removeNode:function(b){a.F(b);b.parentNode&&b.parentNode.removeChild(b)}}};a.F=a.a.G.F;a.removeNode=a.a.G.removeNode;a.b("cleanNode",a.F);a.b("removeNode",a.removeNode);a.b("utils.domNodeDisposal",a.a.G);a.b("utils.domNodeDisposal.addDisposeCallback",a.a.G.wa);a.b("utils.domNodeDisposal.removeDisposeCallback",a.a.G.Ma);(function(){a.a.pa=function(b){var c;if("undefined"!=typeof jQuery){if((c=jQuery.clean([b]))&&c[0]){for(b=c[0];b.parentNode&&11!==b.parentNode.nodeType;)b=b.parentNode;b.parentNode&&
+b.parentNode.removeChild(b)}}else{var d=a.a.w(b).toLowerCase();c=document.createElement("div");d=d.match(/^<(thead|tbody|tfoot)/)&&[1,"<table>","</table>"]||!d.indexOf("<tr")&&[2,"<table><tbody>","</tbody></table>"]||(!d.indexOf("<td")||!d.indexOf("<th"))&&[3,"<table><tbody><tr>","</tr></tbody></table>"]||[0,"",""];b="ignored<div>"+d[1]+b+d[2]+"</div>";for("function"==typeof window.innerShiv?c.appendChild(window.innerShiv(b)):c.innerHTML=b;d[0]--;)c=c.lastChild;c=a.a.L(c.lastChild.childNodes)}return c};
+a.a.Y=function(b,c){a.a.ga(b);if(c!==s&&c!==n)if("string"!=typeof c&&(c=c.toString()),"undefined"!=typeof jQuery)jQuery(b).html(c);else for(var d=a.a.pa(c),f=0;f<d.length;f++)b.appendChild(d[f])}})();a.b("utils.parseHtmlFragment",a.a.pa);a.b("utils.setHtml",a.a.Y);a.s=function(){function b(){return(4294967296*(1+Math.random())|0).toString(16).substring(1)}function c(b,g){if(b)if(8==b.nodeType){var e=a.s.Ja(b.nodeValue);e!=s&&g.push({jb:b,yb:e})}else if(1==b.nodeType)for(var e=0,d=b.childNodes,j=d.length;e<
+j;e++)c(d[e],g)}var d={};return{na:function(a){"function"!=typeof a&&m(Error("You can only pass a function to ko.memoization.memoize()"));var c=b()+b();d[c]=a;return"<\!--[ko_memo:"+c+"]--\>"},Va:function(a,b){var c=d[a];c===n&&m(Error("Couldn't find any memo with ID "+a+". Perhaps it's already been unmemoized."));try{return c.apply(s,b||[]),p}finally{delete d[a]}},Wa:function(b,d){var e=[];c(b,e);for(var h=0,j=e.length;h<j;h++){var k=e[h].jb,i=[k];d&&a.a.N(i,d);a.s.Va(e[h].yb,i);k.nodeValue="";k.parentNode&&
+k.parentNode.removeChild(k)}},Ja:function(a){return(a=a.match(/^\[ko_memo\:(.*?)\]$/))?a[1]:s}}}();a.b("memoization",a.s);a.b("memoization.memoize",a.s.na);a.b("memoization.unmemoize",a.s.Va);a.b("memoization.parseMemoText",a.s.Ja);a.b("memoization.unmemoizeDomNodeAndDescendants",a.s.Wa);a.Ba={throttle:function(b,c){b.throttleEvaluation=c;var d=s;return a.h({read:b,write:function(a){clearTimeout(d);d=setTimeout(function(){b(a)},c)}})},notify:function(b,c){b.equalityComparer="always"==c?A(t):a.m.fn.equalityComparer;
+return b}};a.b("extenders",a.Ba);a.Sa=function(b,c,d){this.target=b;this.ca=c;this.ib=d;a.B(this,"dispose",this.A)};a.Sa.prototype.A=function(){this.sb=p;this.ib()};a.R=function(){this.u={};a.a.extend(this,a.R.fn);a.B(this,"subscribe",this.ta);a.B(this,"extend",this.extend);a.B(this,"getSubscriptionsCount",this.ob)};a.R.fn={ta:function(b,c,d){var d=d||"change",b=c?b.bind(c):b,f=new a.Sa(this,b,function(){a.a.ba(this.u[d],f)}.bind(this));this.u[d]||(this.u[d]=[]);this.u[d].push(f);return f},notifySubscribers:function(b,
+c){c=c||"change";this.u[c]&&a.a.v(this.u[c].slice(0),function(a){a&&a.sb!==p&&a.ca(b)})},ob:function(){var a=0,c;for(c in this.u)this.u.hasOwnProperty(c)&&(a+=this.u[c].length);return a},extend:function(b){var c=this;if(b)for(var d in b){var f=a.Ba[d];"function"==typeof f&&(c=f(c,b[d]))}return c}};a.Ga=function(a){return"function"==typeof a.ta&&"function"==typeof a.notifySubscribers};a.b("subscribable",a.R);a.b("isSubscribable",a.Ga);a.U=function(){var b=[];return{bb:function(a){b.push({ca:a,Aa:[]})},
+end:function(){b.pop()},La:function(c){a.Ga(c)||m(Error("Only subscribable things can act as dependencies"));if(0<b.length){var d=b[b.length-1];0<=a.a.j(d.Aa,c)||(d.Aa.push(c),d.ca(c))}}}}();var G={undefined:p,"boolean":p,number:p,string:p};a.m=function(b){function c(){if(0<arguments.length){if(!c.equalityComparer||!c.equalityComparer(d,arguments[0]))c.I(),d=arguments[0],c.H();return this}a.U.La(c);return d}var d=b;a.R.call(c);c.H=function(){c.notifySubscribers(d)};c.I=function(){c.notifySubscribers(d,
+"beforeChange")};a.a.extend(c,a.m.fn);a.B(c,"valueHasMutated",c.H);a.B(c,"valueWillMutate",c.I);return c};a.m.fn={equalityComparer:function(a,c){return a===s||typeof a in G?a===c:t}};var x=a.m.Db="__ko_proto__";a.m.fn[x]=a.m;a.ia=function(b,c){return b===s||b===n||b[x]===n?t:b[x]===c?p:a.ia(b[x],c)};a.la=function(b){return a.ia(b,a.m)};a.Ha=function(b){return"function"==typeof b&&b[x]===a.m||"function"==typeof b&&b[x]===a.h&&b.pb?p:t};a.b("observable",a.m);a.b("isObservable",a.la);a.b("isWriteableObservable",
+a.Ha);a.Q=function(b){0==arguments.length&&(b=[]);b!==s&&(b!==n&&!("length"in b))&&m(Error("The argument passed when initializing an observable array must be an array, or null, or undefined."));var c=a.m(b);a.a.extend(c,a.Q.fn);return c};a.Q.fn={remove:function(a){for(var c=this(),d=[],f="function"==typeof a?a:function(c){return c===a},g=0;g<c.length;g++){var e=c[g];f(e)&&(0===d.length&&this.I(),d.push(e),c.splice(g,1),g--)}d.length&&this.H();return d},removeAll:function(b){if(b===n){var c=this(),
+d=c.slice(0);this.I();c.splice(0,c.length);this.H();return d}return!b?[]:this.remove(function(c){return 0<=a.a.j(b,c)})},destroy:function(a){var c=this(),d="function"==typeof a?a:function(c){return c===a};this.I();for(var f=c.length-1;0<=f;f--)d(c[f])&&(c[f]._destroy=p);this.H()},destroyAll:function(b){return b===n?this.destroy(A(p)):!b?[]:this.destroy(function(c){return 0<=a.a.j(b,c)})},indexOf:function(b){var c=this();return a.a.j(c,b)},replace:function(a,c){var d=this.indexOf(a);0<=d&&(this.I(),
+this()[d]=c,this.H())}};a.a.v("pop push reverse shift sort splice unshift".split(" "),function(b){a.Q.fn[b]=function(){var a=this();this.I();a=a[b].apply(a,arguments);this.H();return a}});a.a.v(["slice"],function(b){a.Q.fn[b]=function(){var a=this();return a[b].apply(a,arguments)}});a.b("observableArray",a.Q);a.h=function(b,c,d){function f(){a.a.v(v,function(a){a.A()});v=[]}function g(){var a=h.throttleEvaluation;a&&0<=a?(clearTimeout(x),x=setTimeout(e,a)):e()}function e(){if(!l)if(i&&w())u();else{l=
+p;try{var b=a.a.T(v,function(a){return a.target});a.U.bb(function(c){var e;0<=(e=a.a.j(b,c))?b[e]=n:v.push(c.ta(g))});for(var e=q.call(c),f=b.length-1;0<=f;f--)b[f]&&v.splice(f,1)[0].A();i=p;h.notifySubscribers(k,"beforeChange");k=e}finally{a.U.end()}h.notifySubscribers(k);l=t}}function h(){if(0<arguments.length)j.apply(h,arguments);else return i||e(),a.U.La(h),k}function j(){"function"===typeof o?o.apply(c,arguments):m(Error("Cannot write a value to a ko.computed unless you specify a 'write' option. If you wish to read the current value, don't pass any parameters."))}
+var k,i=t,l=t,q=b;q&&"object"==typeof q?(d=q,q=d.read):(d=d||{},q||(q=d.read));"function"!=typeof q&&m(Error("Pass a function that returns the value of the ko.computed"));var o=d.write;c||(c=d.owner);var v=[],u=f,r="object"==typeof d.disposeWhenNodeIsRemoved?d.disposeWhenNodeIsRemoved:s,w=d.disposeWhen||A(t);if(r){u=function(){a.a.G.Ma(r,arguments.callee);f()};a.a.G.wa(r,u);var y=w,w=function(){return!a.a.fa(r)||y()}}var x=s;h.nb=function(){return v.length};h.pb="function"===typeof d.write;h.A=function(){u()};
+a.R.call(h);a.a.extend(h,a.h.fn);d.deferEvaluation!==p&&e();a.B(h,"dispose",h.A);a.B(h,"getDependenciesCount",h.nb);return h};a.rb=function(b){return a.ia(b,a.h)};w=a.m.Db;a.h[w]=a.m;a.h.fn={};a.h.fn[w]=a.h;a.b("dependentObservable",a.h);a.b("computed",a.h);a.b("isComputed",a.rb);(function(){function b(a,g,e){e=e||new d;a=g(a);if(!("object"==typeof a&&a!==s&&a!==n&&!(a instanceof Date)))return a;var h=a instanceof Array?[]:{};e.save(a,h);c(a,function(c){var d=g(a[c]);switch(typeof d){case "boolean":case "number":case "string":case "function":h[c]=
+d;break;case "object":case "undefined":var i=e.get(d);h[c]=i!==n?i:b(d,g,e)}});return h}function c(a,b){if(a instanceof Array){for(var c=0;c<a.length;c++)b(c);"function"==typeof a.toJSON&&b("toJSON")}else for(c in a)b(c)}function d(){var b=[],c=[];this.save=function(e,d){var j=a.a.j(b,e);0<=j?c[j]=d:(b.push(e),c.push(d))};this.get=function(e){e=a.a.j(b,e);return 0<=e?c[e]:n}}a.Ta=function(c){0==arguments.length&&m(Error("When calling ko.toJS, pass the object you want to convert."));return b(c,function(b){for(var c=
+0;a.la(b)&&10>c;c++)b=b();return b})};a.toJSON=function(b,c,e){b=a.Ta(b);return a.a.sa(b,c,e)}})();a.b("toJS",a.Ta);a.b("toJSON",a.toJSON);(function(){a.k={r:function(b){switch(a.a.o(b)){case "option":return b.__ko__hasDomDataOptionValue__===p?a.a.f.get(b,a.c.options.oa):b.getAttribute("value");case "select":return 0<=b.selectedIndex?a.k.r(b.options[b.selectedIndex]):n;default:return b.value}},S:function(b,c){switch(a.a.o(b)){case "option":switch(typeof c){case "string":a.a.f.set(b,a.c.options.oa,
+n);"__ko__hasDomDataOptionValue__"in b&&delete b.__ko__hasDomDataOptionValue__;b.value=c;break;default:a.a.f.set(b,a.c.options.oa,c),b.__ko__hasDomDataOptionValue__=p,b.value="number"===typeof c?c:""}break;case "select":for(var d=b.options.length-1;0<=d;d--)if(a.k.r(b.options[d])==c){b.selectedIndex=d;break}break;default:if(c===s||c===n)c="";b.value=c}}}})();a.b("selectExtensions",a.k);a.b("selectExtensions.readValue",a.k.r);a.b("selectExtensions.writeValue",a.k.S);a.g=function(){function b(a,b){for(var d=
+s;a!=d;)d=a,a=a.replace(c,function(a,c){return b[c]});return a}var c=/\@ko_token_(\d+)\@/g,d=/^[\_$a-z][\_$a-z0-9]*(\[.*?\])*(\.[\_$a-z][\_$a-z0-9]*(\[.*?\])*)*$/i,f=["true","false"];return{D:[],W:function(c){var e=a.a.w(c);if(3>e.length)return[];"{"===e.charAt(0)&&(e=e.substring(1,e.length-1));for(var c=[],d=s,f,k=0;k<e.length;k++){var i=e.charAt(k);if(d===s)switch(i){case '"':case "'":case "/":d=k,f=i}else if(i==f&&"\\"!==e.charAt(k-1)){i=e.substring(d,k+1);c.push(i);var l="@ko_token_"+(c.length-
+1)+"@",e=e.substring(0,d)+l+e.substring(k+1),k=k-(i.length-l.length),d=s}}f=d=s;for(var q=0,o=s,k=0;k<e.length;k++){i=e.charAt(k);if(d===s)switch(i){case "{":d=k;o=i;f="}";break;case "(":d=k;o=i;f=")";break;case "[":d=k,o=i,f="]"}i===o?q++:i===f&&(q--,0===q&&(i=e.substring(d,k+1),c.push(i),l="@ko_token_"+(c.length-1)+"@",e=e.substring(0,d)+l+e.substring(k+1),k-=i.length-l.length,d=s))}f=[];e=e.split(",");d=0;for(k=e.length;d<k;d++)q=e[d],o=q.indexOf(":"),0<o&&o<q.length-1?(i=q.substring(o+1),f.push({key:b(q.substring(0,
+o),c),value:b(i,c)})):f.push({unknown:b(q,c)});return f},ka:function(b){for(var c="string"===typeof b?a.g.W(b):b,h=[],b=[],j,k=0;j=c[k];k++)if(0<h.length&&h.push(","),j.key){var i;a:{i=j.key;var l=a.a.w(i);switch(l.length&&l.charAt(0)){case "'":case '"':break a;default:i="'"+l+"'"}}j=j.value;h.push(i);h.push(":");h.push(j);l=a.a.w(j);if(0<=a.a.j(f,a.a.w(l).toLowerCase())?0:l.match(d)!==s)0<b.length&&b.push(", "),b.push(i+" : function(__ko_value) { "+j+" = __ko_value; }")}else j.unknown&&h.push(j.unknown);
+c=h.join("");0<b.length&&(c=c+", '_ko_property_writers' : { "+b.join("")+" } ");return c},wb:function(b,c){for(var d=0;d<b.length;d++)if(a.a.w(b[d].key)==c)return p;return t},$:function(b,c,d,f,k){if(!b||!a.Ha(b)){if((b=c()._ko_property_writers)&&b[d])b[d](f)}else(!k||b()!==f)&&b(f)}}}();a.b("jsonExpressionRewriting",a.g);a.b("jsonExpressionRewriting.bindingRewriteValidators",a.g.D);a.b("jsonExpressionRewriting.parseObjectLiteral",a.g.W);a.b("jsonExpressionRewriting.insertPropertyAccessorsIntoJson",
+a.g.ka);(function(){function b(a){return 8==a.nodeType&&(g?a.text:a.nodeValue).match(e)}function c(a){return 8==a.nodeType&&(g?a.text:a.nodeValue).match(h)}function d(a,e){for(var d=a,f=1,g=[];d=d.nextSibling;){if(c(d)&&(f--,0===f))return g;g.push(d);b(d)&&f++}e||m(Error("Cannot find closing comment tag to match: "+a.nodeValue));return s}function f(a,b){var c=d(a,b);return c?0<c.length?c[c.length-1].nextSibling:a.nextSibling:s}var g="<\!--test--\>"===document.createComment("test").text,e=g?/^<\!--\s*ko\s+(.*\:.*)\s*--\>$/:
+/^\s*ko\s+(.*\:.*)\s*$/,h=g?/^<\!--\s*\/ko\s*--\>$/:/^\s*\/ko\s*$/,j={ul:p,ol:p};a.e={C:{},childNodes:function(a){return b(a)?d(a):a.childNodes},ha:function(c){if(b(c))for(var c=a.e.childNodes(c),e=0,d=c.length;e<d;e++)a.removeNode(c[e]);else a.a.ga(c)},X:function(c,e){if(b(c)){a.e.ha(c);for(var d=c.nextSibling,f=0,g=e.length;f<g;f++)d.parentNode.insertBefore(e[f],d)}else a.a.X(c,e)},Ka:function(a,c){b(a)?a.parentNode.insertBefore(c,a.nextSibling):a.firstChild?a.insertBefore(c,a.firstChild):a.appendChild(c)},
+Fa:function(a,c,e){b(a)?a.parentNode.insertBefore(c,e.nextSibling):e.nextSibling?a.insertBefore(c,e.nextSibling):a.appendChild(c)},firstChild:function(a){return!b(a)?a.firstChild:!a.nextSibling||c(a.nextSibling)?s:a.nextSibling},nextSibling:function(a){b(a)&&(a=f(a));return a.nextSibling&&c(a.nextSibling)?s:a.nextSibling},Xa:function(a){return(a=b(a))?a[1]:s},Ia:function(e){if(j[a.a.o(e)]){var d=e.firstChild;if(d){do if(1===d.nodeType){var g;g=d.firstChild;var h=s;if(g){do if(h)h.push(g);else if(b(g)){var o=
+f(g,p);o?g=o:h=[g]}else c(g)&&(h=[g]);while(g=g.nextSibling)}if(g=h){h=d.nextSibling;for(o=0;o<g.length;o++)h?e.insertBefore(g[o],h):e.appendChild(g[o])}}while(d=d.nextSibling)}}}}})();a.b("virtualElements",a.e);a.b("virtualElements.allowedBindings",a.e.C);a.b("virtualElements.emptyNode",a.e.ha);a.b("virtualElements.insertAfter",a.e.Fa);a.b("virtualElements.prepend",a.e.Ka);a.b("virtualElements.setDomNodeChildren",a.e.X);(function(){a.J=function(){this.cb={}};a.a.extend(a.J.prototype,{nodeHasBindings:function(b){switch(b.nodeType){case 1:return b.getAttribute("data-bind")!=
+s;case 8:return a.e.Xa(b)!=s;default:return t}},getBindings:function(a,c){var d=this.getBindingsString(a,c);return d?this.parseBindingsString(d,c):s},getBindingsString:function(b){switch(b.nodeType){case 1:return b.getAttribute("data-bind");case 8:return a.e.Xa(b);default:return s}},parseBindingsString:function(b,c){try{var d=c.$data,d="object"==typeof d&&d!=s?[d,c]:[c],f=d.length,g=this.cb,e=f+"_"+b,h;if(!(h=g[e])){var j=" { "+a.g.ka(b)+" } ";h=g[e]=a.a.eb(j,f)}return h(d)}catch(k){m(Error("Unable to parse bindings.\nMessage: "+
+k+";\nBindings value: "+b))}}});a.J.instance=new a.J})();a.b("bindingProvider",a.J);(function(){function b(b,d,e){for(var h=a.e.firstChild(d);d=h;)h=a.e.nextSibling(d),c(b,d,e)}function c(c,g,e){var h=p,j=1===g.nodeType;j&&a.e.Ia(g);if(j&&e||a.J.instance.nodeHasBindings(g))h=d(g,s,c,e).Gb;h&&b(c,g,!j)}function d(b,c,e,d){function j(a){return function(){return l[a]}}function k(){return l}var i=0,l,q;a.h(function(){var o=e&&e instanceof a.z?e:new a.z(a.a.d(e)),v=o.$data;d&&a.Ra(b,o);if(l=("function"==
+typeof c?c():c)||a.J.instance.getBindings(b,o)){if(0===i){i=1;for(var u in l){var r=a.c[u];r&&8===b.nodeType&&!a.e.C[u]&&m(Error("The binding '"+u+"' cannot be used with virtual elements"));if(r&&"function"==typeof r.init&&(r=(0,r.init)(b,j(u),k,v,o))&&r.controlsDescendantBindings)q!==n&&m(Error("Multiple bindings ("+q+" and "+u+") are trying to control descendant bindings of the same element. You cannot use these bindings together on the same element.")),q=u}i=2}if(2===i)for(u in l)(r=a.c[u])&&"function"==
+typeof r.update&&(0,r.update)(b,j(u),k,v,o)}},s,{disposeWhenNodeIsRemoved:b});return{Gb:q===n}}a.c={};a.z=function(b,c){c?(a.a.extend(this,c),this.$parentContext=c,this.$parent=c.$data,this.$parents=(c.$parents||[]).slice(0),this.$parents.unshift(this.$parent)):(this.$parents=[],this.$root=b);this.$data=b};a.z.prototype.createChildContext=function(b){return new a.z(b,this)};a.z.prototype.extend=function(b){var c=a.a.extend(new a.z,this);return a.a.extend(c,b)};a.Ra=function(b,c){if(2==arguments.length)a.a.f.set(b,
+"__ko_bindingContext__",c);else return a.a.f.get(b,"__ko_bindingContext__")};a.ya=function(b,c,e){1===b.nodeType&&a.e.Ia(b);return d(b,c,e,p)};a.Ya=function(a,c){(1===c.nodeType||8===c.nodeType)&&b(a,c,p)};a.xa=function(a,b){b&&(1!==b.nodeType&&8!==b.nodeType)&&m(Error("ko.applyBindings: first parameter should be your view model; second parameter should be a DOM node"));b=b||window.document.body;c(a,b,p)};a.ea=function(b){switch(b.nodeType){case 1:case 8:var c=a.Ra(b);if(c)return c;if(b.parentNode)return a.ea(b.parentNode)}};
+a.hb=function(b){return(b=a.ea(b))?b.$data:n};a.b("bindingHandlers",a.c);a.b("applyBindings",a.xa);a.b("applyBindingsToDescendants",a.Ya);a.b("applyBindingsToNode",a.ya);a.b("contextFor",a.ea);a.b("dataFor",a.hb)})();a.a.v(["click"],function(b){a.c[b]={init:function(c,d,f,g){return a.c.event.init.call(this,c,function(){var a={};a[b]=d();return a},f,g)}}});a.c.event={init:function(b,c,d,f){var g=c()||{},e;for(e in g)(function(){var g=e;"string"==typeof g&&a.a.n(b,g,function(b){var e,i=c()[g];if(i){var l=
+d();try{var q=a.a.L(arguments);q.unshift(f);e=i.apply(f,q)}finally{e!==p&&(b.preventDefault?b.preventDefault():b.returnValue=t)}l[g+"Bubble"]===t&&(b.cancelBubble=p,b.stopPropagation&&b.stopPropagation())}})})()}};a.c.submit={init:function(b,c,d,f){"function"!=typeof c()&&m(Error("The value for a submit binding must be a function"));a.a.n(b,"submit",function(a){var e,d=c();try{e=d.call(f,b)}finally{e!==p&&(a.preventDefault?a.preventDefault():a.returnValue=t)}})}};a.c.visible={update:function(b,c){var d=
+a.a.d(c()),f="none"!=b.style.display;d&&!f?b.style.display="":!d&&f&&(b.style.display="none")}};a.c.enable={update:function(b,c){var d=a.a.d(c());d&&b.disabled?b.removeAttribute("disabled"):!d&&!b.disabled&&(b.disabled=p)}};a.c.disable={update:function(b,c){a.c.enable.update(b,function(){return!a.a.d(c())})}};a.c.value={init:function(b,c,d){function f(){var e=c(),f=a.k.r(b);a.g.$(e,d,"value",f,p)}var g=["change"],e=d().valueUpdate;e&&("string"==typeof e&&(e=[e]),a.a.N(g,e),g=a.a.za(g));if(a.a.ja&&
+("input"==b.tagName.toLowerCase()&&"text"==b.type&&"off"!=b.autocomplete&&(!b.form||"off"!=b.form.autocomplete))&&-1==a.a.j(g,"propertychange")){var h=t;a.a.n(b,"propertychange",function(){h=p});a.a.n(b,"blur",function(){if(h){h=t;f()}})}a.a.v(g,function(c){var e=f;if(a.a.Hb(c,"after")){e=function(){setTimeout(f,0)};c=c.substring(5)}a.a.n(b,c,e)})},update:function(b,c){var d="select"===a.a.o(b),f=a.a.d(c()),g=a.k.r(b),e=f!=g;0===f&&(0!==g&&"0"!==g)&&(e=p);e&&(g=function(){a.k.S(b,f)},g(),d&&setTimeout(g,
+0));d&&0<b.length&&B(b,f,t)}};a.c.options={update:function(b,c,d){"select"!==a.a.o(b)&&m(Error("options binding applies only to SELECT elements"));for(var f=0==b.length,g=a.a.T(a.a.aa(b.childNodes,function(b){return b.tagName&&"option"===a.a.o(b)&&b.selected}),function(b){return a.k.r(b)||b.innerText||b.textContent}),e=b.scrollTop,h=a.a.d(c());0<b.length;)a.F(b.options[0]),b.remove(0);if(h){d=d();"number"!=typeof h.length&&(h=[h]);if(d.optionsCaption){var j=document.createElement("option");a.a.Y(j,
+d.optionsCaption);a.k.S(j,n);b.appendChild(j)}for(var c=0,k=h.length;c<k;c++){var j=document.createElement("option"),i="string"==typeof d.optionsValue?h[c][d.optionsValue]:h[c],i=a.a.d(i);a.k.S(j,i);var l=d.optionsText,i="function"==typeof l?l(h[c]):"string"==typeof l?h[c][l]:i;if(i===s||i===n)i="";a.a.Qa(j,i);b.appendChild(j)}h=b.getElementsByTagName("option");c=j=0;for(k=h.length;c<k;c++)0<=a.a.j(g,a.k.r(h[c]))&&(a.a.Pa(h[c],p),j++);b.scrollTop=e;f&&"value"in d&&B(b,a.a.d(d.value),p);a.a.lb(b)}}};
+a.c.options.oa="__ko.optionValueDomData__";a.c.selectedOptions={Ea:function(b){for(var c=[],b=b.childNodes,d=0,f=b.length;d<f;d++){var g=b[d],e=a.a.o(g);"option"==e&&g.selected?c.push(a.k.r(g)):"optgroup"==e&&(g=a.c.selectedOptions.Ea(g),Array.prototype.splice.apply(c,[c.length,0].concat(g)))}return c},init:function(b,c,d){a.a.n(b,"change",function(){var b=c(),g=a.c.selectedOptions.Ea(this);a.g.$(b,d,"value",g)})},update:function(b,c){"select"!=a.a.o(b)&&m(Error("values binding applies only to SELECT elements"));
+var d=a.a.d(c());if(d&&"number"==typeof d.length)for(var f=b.childNodes,g=0,e=f.length;g<e;g++){var h=f[g];"option"===a.a.o(h)&&a.a.Pa(h,0<=a.a.j(d,a.k.r(h)))}}};a.c.text={update:function(b,c){a.a.Qa(b,c())}};a.c.html={init:function(){return{controlsDescendantBindings:p}},update:function(b,c){var d=a.a.d(c());a.a.Y(b,d)}};a.c.css={update:function(b,c){var d=a.a.d(c()||{}),f;for(f in d)if("string"==typeof f){var g=a.a.d(d[f]);a.a.Ua(b,f,g)}}};a.c.style={update:function(b,c){var d=a.a.d(c()||{}),f;
+for(f in d)if("string"==typeof f){var g=a.a.d(d[f]);b.style[f]=g||""}}};a.c.uniqueName={init:function(b,c){c()&&(b.name="ko_unique_"+ ++a.c.uniqueName.gb,(a.a.tb||a.a.ub)&&b.mergeAttributes(document.createElement("<input name='"+b.name+"'/>"),t))}};a.c.uniqueName.gb=0;a.c.checked={init:function(b,c,d){a.a.n(b,"click",function(){var f;if("checkbox"==b.type)f=b.checked;else if("radio"==b.type&&b.checked)f=b.value;else return;var g=c();"checkbox"==b.type&&a.a.d(g)instanceof Array?(f=a.a.j(a.a.d(g),b.value),
+b.checked&&0>f?g.push(b.value):!b.checked&&0<=f&&g.splice(f,1)):a.g.$(g,d,"checked",f,p)});"radio"==b.type&&!b.name&&a.c.uniqueName.init(b,A(p))},update:function(b,c){var d=a.a.d(c());"checkbox"==b.type?b.checked=d instanceof Array?0<=a.a.j(d,b.value):d:"radio"==b.type&&(b.checked=b.value==d)}};var F={"class":"className","for":"htmlFor"};a.c.attr={update:function(b,c){var d=a.a.d(c())||{},f;for(f in d)if("string"==typeof f){var g=a.a.d(d[f]),e=g===t||g===s||g===n;e&&b.removeAttribute(f);8>=a.a.ja&&
+f in F?(f=F[f],e?b.removeAttribute(f):b[f]=g):e||b.setAttribute(f,g.toString())}}};a.c.hasfocus={init:function(b,c,d){function f(b){var e=c();a.g.$(e,d,"hasfocus",b,p)}a.a.n(b,"focus",function(){f(p)});a.a.n(b,"focusin",function(){f(p)});a.a.n(b,"blur",function(){f(t)});a.a.n(b,"focusout",function(){f(t)})},update:function(b,c){var d=a.a.d(c());d?b.focus():b.blur();a.a.va(b,d?"focusin":"focusout")}};a.c["with"]={p:function(b){return function(){var c=b();return{"if":c,data:c,templateEngine:a.q.K}}},
+init:function(b,c){return a.c.template.init(b,a.c["with"].p(c))},update:function(b,c,d,f,g){return a.c.template.update(b,a.c["with"].p(c),d,f,g)}};a.g.D["with"]=t;a.e.C["with"]=p;a.c["if"]={p:function(b){return function(){return{"if":b(),templateEngine:a.q.K}}},init:function(b,c){return a.c.template.init(b,a.c["if"].p(c))},update:function(b,c,d,f,g){return a.c.template.update(b,a.c["if"].p(c),d,f,g)}};a.g.D["if"]=t;a.e.C["if"]=p;a.c.ifnot={p:function(b){return function(){return{ifnot:b(),templateEngine:a.q.K}}},
+init:function(b,c){return a.c.template.init(b,a.c.ifnot.p(c))},update:function(b,c,d,f,g){return a.c.template.update(b,a.c.ifnot.p(c),d,f,g)}};a.g.D.ifnot=t;a.e.C.ifnot=p;a.c.foreach={p:function(b){return function(){var c=a.a.d(b());return!c||"number"==typeof c.length?{foreach:c,templateEngine:a.q.K}:{foreach:c.data,includeDestroyed:c.includeDestroyed,afterAdd:c.afterAdd,beforeRemove:c.beforeRemove,afterRender:c.afterRender,templateEngine:a.q.K}}},init:function(b,c){return a.c.template.init(b,a.c.foreach.p(c))},
+update:function(b,c,d,f,g){return a.c.template.update(b,a.c.foreach.p(c),d,f,g)}};a.g.D.foreach=t;a.e.C.foreach=p;a.t=function(){};a.t.prototype.renderTemplateSource=function(){m(Error("Override renderTemplateSource"))};a.t.prototype.createJavaScriptEvaluatorBlock=function(){m(Error("Override createJavaScriptEvaluatorBlock"))};a.t.prototype.makeTemplateSource=function(b,c){if("string"==typeof b){var c=c||document,d=c.getElementById(b);d||m(Error("Cannot find template with ID "+b));return new a.l.i(d)}if(1==
+b.nodeType||8==b.nodeType)return new a.l.M(b);m(Error("Unknown template type: "+b))};a.t.prototype.renderTemplate=function(a,c,d,f){return this.renderTemplateSource(this.makeTemplateSource(a,f),c,d)};a.t.prototype.isTemplateRewritten=function(a,c){return this.allowTemplateRewriting===t||!(c&&c!=document)&&this.V&&this.V[a]?p:this.makeTemplateSource(a,c).data("isRewritten")};a.t.prototype.rewriteTemplate=function(a,c,d){var f=this.makeTemplateSource(a,d),c=c(f.text());f.text(c);f.data("isRewritten",
+p);!(d&&d!=document)&&"string"==typeof a&&(this.V=this.V||{},this.V[a]=p)};a.b("templateEngine",a.t);a.Z=function(){function b(b,c,e){for(var b=a.g.W(b),d=a.g.D,j=0;j<b.length;j++){var k=b[j].key;if(d.hasOwnProperty(k)){var i=d[k];"function"===typeof i?(k=i(b[j].value))&&m(Error(k)):i||m(Error("This template engine does not support the '"+k+"' binding within its templates"))}}b="ko.templateRewriting.applyMemoizedBindingsToNextSibling(function() {             return (function() { return { "+a.g.ka(b)+
+" } })()         })";return e.createJavaScriptEvaluatorBlock(b)+c}var c=/(<[a-z]+\d*(\s+(?!data-bind=)[a-z0-9\-]+(=(\"[^\"]*\"|\'[^\']*\'))?)*\s+)data-bind=(["'])([\s\S]*?)\5/gi,d=/<\!--\s*ko\b\s*([\s\S]*?)\s*--\>/g;return{mb:function(b,c,e){c.isTemplateRewritten(b,e)||c.rewriteTemplate(b,function(b){return a.Z.zb(b,c)},e)},zb:function(a,g){return a.replace(c,function(a,c,d,f,i,l,q){return b(q,c,g)}).replace(d,function(a,c){return b(c,"<\!-- ko --\>",g)})},Za:function(b){return a.s.na(function(c,
+e){c.nextSibling&&a.ya(c.nextSibling,b,e)})}}}();a.b("templateRewriting",a.Z);a.b("templateRewriting.applyMemoizedBindingsToNextSibling",a.Z.Za);(function(){a.l={};a.l.i=function(a){this.i=a};a.l.i.prototype.text=function(){var b=a.a.o(this.i),b="script"===b?"text":"textarea"===b?"value":"innerHTML";if(0==arguments.length)return this.i[b];var c=arguments[0];"innerHTML"===b?a.a.Y(this.i,c):this.i[b]=c};a.l.i.prototype.data=function(b){if(1===arguments.length)return a.a.f.get(this.i,"templateSourceData_"+
+b);a.a.f.set(this.i,"templateSourceData_"+b,arguments[1])};a.l.M=function(a){this.i=a};a.l.M.prototype=new a.l.i;a.l.M.prototype.text=function(){if(0==arguments.length){var b=a.a.f.get(this.i,"__ko_anon_template__")||{};b.ua===n&&b.da&&(b.ua=b.da.innerHTML);return b.ua}a.a.f.set(this.i,"__ko_anon_template__",{ua:arguments[0]})};a.l.i.prototype.nodes=function(){if(0==arguments.length)return(a.a.f.get(this.i,"__ko_anon_template__")||{}).da;a.a.f.set(this.i,"__ko_anon_template__",{da:arguments[0]})};
+a.b("templateSources",a.l);a.b("templateSources.domElement",a.l.i);a.b("templateSources.anonymousTemplate",a.l.M)})();(function(){function b(b,c,d){for(var f,c=a.e.nextSibling(c);b&&(f=b)!==c;)b=a.e.nextSibling(f),(1===f.nodeType||8===f.nodeType)&&d(f)}function c(c,d){if(c.length){var f=c[0],g=c[c.length-1];b(f,g,function(b){a.xa(d,b)});b(f,g,function(b){a.s.Wa(b,[d])})}}function d(a){return a.nodeType?a:0<a.length?a[0]:s}function f(b,f,j,k,i){var i=i||{},l=b&&d(b),l=l&&l.ownerDocument,q=i.templateEngine||
+g;a.Z.mb(j,q,l);j=q.renderTemplate(j,k,i,l);("number"!=typeof j.length||0<j.length&&"number"!=typeof j[0].nodeType)&&m(Error("Template engine must return an array of DOM nodes"));l=t;switch(f){case "replaceChildren":a.e.X(b,j);l=p;break;case "replaceNode":a.a.Na(b,j);l=p;break;case "ignoreTargetNode":break;default:m(Error("Unknown renderMode: "+f))}l&&(c(j,k),i.afterRender&&i.afterRender(j,k.$data));return j}var g;a.ra=function(b){b!=n&&!(b instanceof a.t)&&m(Error("templateEngine must inherit from ko.templateEngine"));
+g=b};a.qa=function(b,c,j,k,i){j=j||{};(j.templateEngine||g)==n&&m(Error("Set a template engine before calling renderTemplate"));i=i||"replaceChildren";if(k){var l=d(k);return a.h(function(){var g=c&&c instanceof a.z?c:new a.z(a.a.d(c)),o="function"==typeof b?b(g.$data):b,g=f(k,i,o,g,j);"replaceNode"==i&&(k=g,l=d(k))},s,{disposeWhen:function(){return!l||!a.a.fa(l)},disposeWhenNodeIsRemoved:l&&"replaceNode"==i?l.parentNode:l})}return a.s.na(function(d){a.qa(b,c,j,d,"replaceNode")})};a.Fb=function(b,
+d,g,k,i){function l(a,b){c(b,o);g.afterRender&&g.afterRender(b,a)}function q(c,d){var h="function"==typeof b?b(c):b;o=i.createChildContext(a.a.d(c));o.$index=d;return f(s,"ignoreTargetNode",h,o,g)}var o;return a.h(function(){var b=a.a.d(d)||[];"undefined"==typeof b.length&&(b=[b]);b=a.a.aa(b,function(b){return g.includeDestroyed||b===n||b===s||!a.a.d(b._destroy)});a.a.Oa(k,b,q,g,l)},s,{disposeWhenNodeIsRemoved:k})};a.c.template={init:function(b,c){var d=a.a.d(c());if("string"!=typeof d&&!d.name&&
+(1==b.nodeType||8==b.nodeType))d=1==b.nodeType?b.childNodes:a.e.childNodes(b),d=a.a.Ab(d),(new a.l.M(b)).nodes(d);return{controlsDescendantBindings:p}},update:function(b,c,d,f,g){c=a.a.d(c());f=p;"string"==typeof c?d=c:(d=c.name,"if"in c&&(f=f&&a.a.d(c["if"])),"ifnot"in c&&(f=f&&!a.a.d(c.ifnot)));var l=s;"object"===typeof c&&"foreach"in c?l=a.Fb(d||b,f&&c.foreach||[],c,b,g):f?(g="object"==typeof c&&"data"in c?g.createChildContext(a.a.d(c.data)):g,l=a.qa(d||b,g,c,b)):a.e.ha(b);g=l;(c=a.a.f.get(b,"__ko__templateSubscriptionDomDataKey__"))&&
+"function"==typeof c.A&&c.A();a.a.f.set(b,"__ko__templateSubscriptionDomDataKey__",g)}};a.g.D.template=function(b){b=a.g.W(b);return 1==b.length&&b[0].unknown||a.g.wb(b,"name")?s:"This template engine does not support anonymous templates nested within its templates"};a.e.C.template=p})();a.b("setTemplateEngine",a.ra);a.b("renderTemplate",a.qa);(function(){a.a.O=function(b,c,d){if(d===n)return a.a.O(b,c,1)||a.a.O(b,c,10)||a.a.O(b,c,Number.MAX_VALUE);for(var b=b||[],c=c||[],f=b,g=c,e=[],h=0;h<=g.length;h++)e[h]=
+[];for(var h=0,j=Math.min(f.length,d);h<=j;h++)e[0][h]=h;h=1;for(j=Math.min(g.length,d);h<=j;h++)e[h][0]=h;for(var j=f.length,k,i=g.length,h=1;h<=j;h++){k=Math.max(1,h-d);for(var l=Math.min(i,h+d);k<=l;k++)e[k][h]=f[h-1]===g[k-1]?e[k-1][h-1]:Math.min(e[k-1][h]===n?Number.MAX_VALUE:e[k-1][h]+1,e[k][h-1]===n?Number.MAX_VALUE:e[k][h-1]+1)}d=b.length;f=c.length;g=[];h=e[f][d];if(h===n)e=s;else{for(;0<d||0<f;){j=e[f][d];i=0<f?e[f-1][d]:h+1;l=0<d?e[f][d-1]:h+1;k=0<f&&0<d?e[f-1][d-1]:h+1;if(i===n||i<j-1)i=
+h+1;if(l===n||l<j-1)l=h+1;k<j-1&&(k=h+1);i<=l&&i<k?(g.push({status:"added",value:c[f-1]}),f--):(l<i&&l<k?g.push({status:"deleted",value:b[d-1]}):(g.push({status:"retained",value:b[d-1]}),f--),d--)}e=g.reverse()}return e}})();a.b("utils.compareArrays",a.a.O);(function(){function b(a){if(2<a.length){for(var b=a[0],c=a[a.length-1],e=[b];b!==c;){b=b.nextSibling;if(!b)return;e.push(b)}Array.prototype.splice.apply(a,[0,a.length].concat(e))}}function c(c,f,g,e,h){var j=[],c=a.h(function(){var c=f(g,h)||
+[];0<j.length&&(b(j),a.a.Na(j,c),e&&e(g,c));j.splice(0,j.length);a.a.N(j,c)},s,{disposeWhenNodeIsRemoved:c,disposeWhen:function(){return 0==j.length||!a.a.fa(j[0])}});return{xb:j,h:c}}a.a.Oa=function(d,f,g,e,h){for(var f=f||[],e=e||{},j=a.a.f.get(d,"setDomNodeChildrenFromArrayMapping_lastMappingResult")===n,k=a.a.f.get(d,"setDomNodeChildrenFromArrayMapping_lastMappingResult")||[],i=a.a.T(k,function(a){return a.$a}),l=a.a.O(i,f),f=[],q=0,o=[],v=0,i=[],u=s,r=0,w=l.length;r<w;r++)switch(l[r].status){case "retained":var y=
+k[q];y.qb(v);v=f.push(y);0<y.P.length&&(u=y.P[y.P.length-1]);q++;break;case "deleted":k[q].h.A();b(k[q].P);a.a.v(k[q].P,function(a){o.push({element:a,index:r,value:l[r].value});u=a});q++;break;case "added":for(var y=l[r].value,x=a.m(v),v=c(d,g,y,h,x),C=v.xb,v=f.push({$a:l[r].value,P:C,h:v.h,qb:x}),z=0,B=C.length;z<B;z++){var D=C[z];i.push({element:D,index:r,value:l[r].value});u==s?a.e.Ka(d,D):a.e.Fa(d,D,u);u=D}h&&h(y,C,x)}a.a.v(o,function(b){a.F(b.element)});g=t;if(!j){if(e.afterAdd)for(r=0;r<i.length;r++)e.afterAdd(i[r].element,
+i[r].index,i[r].value);if(e.beforeRemove){for(r=0;r<o.length;r++)e.beforeRemove(o[r].element,o[r].index,o[r].value);g=p}}if(!g&&o.length)for(r=0;r<o.length;r++)e=o[r].element,e.parentNode&&e.parentNode.removeChild(e);a.a.f.set(d,"setDomNodeChildrenFromArrayMapping_lastMappingResult",f)}})();a.b("utils.setDomNodeChildrenFromArrayMapping",a.a.Oa);a.q=function(){this.allowTemplateRewriting=t};a.q.prototype=new a.t;a.q.prototype.renderTemplateSource=function(b){var c=!(9>a.a.ja)&&b.nodes?b.nodes():s;
+if(c)return a.a.L(c.cloneNode(p).childNodes);b=b.text();return a.a.pa(b)};a.q.K=new a.q;a.ra(a.q.K);a.b("nativeTemplateEngine",a.q);(function(){a.ma=function(){var a=this.vb=function(){if("undefined"==typeof jQuery||!jQuery.tmpl)return 0;try{if(0<=jQuery.tmpl.tag.tmpl.open.toString().indexOf("__"))return 2}catch(a){}return 1}();this.renderTemplateSource=function(b,f,g){g=g||{};2>a&&m(Error("Your version of jQuery.tmpl is too old. Please upgrade to jQuery.tmpl 1.0.0pre or later."));var e=b.data("precompiled");
+e||(e=b.text()||"",e=jQuery.template(s,"{{ko_with $item.koBindingContext}}"+e+"{{/ko_with}}"),b.data("precompiled",e));b=[f.$data];f=jQuery.extend({koBindingContext:f},g.templateOptions);f=jQuery.tmpl(e,b,f);f.appendTo(document.createElement("div"));jQuery.fragments={};return f};this.createJavaScriptEvaluatorBlock=function(a){return"{{ko_code ((function() { return "+a+" })()) }}"};this.addTemplate=function(a,b){document.write("<script type='text/html' id='"+a+"'>"+b+"<\/script>")};0<a&&(jQuery.tmpl.tag.ko_code=
+{open:"__.push($1 || '');"},jQuery.tmpl.tag.ko_with={open:"with($1) {",close:"} "})};a.ma.prototype=new a.t;var b=new a.ma;0<b.vb&&a.ra(b);a.b("jqueryTmplTemplateEngine",a.ma)})()}"function"===typeof require&&"object"===typeof exports&&"object"===typeof module?E(module.exports||exports):"function"===typeof define&&define.amd?define(["exports"],E):E(window.ko={});p;
+})(window,document,navigator);
diff --git a/samples/Cellar/CellarServer/Content/scripts/require.min.js b/samples/Cellar/CellarServer/Content/scripts/require.min.js
new file mode 100644
index 000000000..4e0dea6de
--- /dev/null
+++ b/samples/Cellar/CellarServer/Content/scripts/require.min.js
@@ -0,0 +1,35 @@
+/*
+ RequireJS 2.0.4 Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved.
+ Available via the MIT or new BSD license.
+ see: http://github.com/jrburke/requirejs for details
+*/
+var requirejs,require,define;
+(function(Y){function x(b){return J.call(b)==="[object Function]"}function G(b){return J.call(b)==="[object Array]"}function q(b,c){if(b){var e;for(e=0;e<b.length;e+=1)if(b[e]&&c(b[e],e,b))break}}function N(b,c){if(b){var e;for(e=b.length-1;e>-1;e-=1)if(b[e]&&c(b[e],e,b))break}}function y(b,c){for(var e in b)if(b.hasOwnProperty(e)&&c(b[e],e))break}function K(b,c,e,i){c&&y(c,function(c,j){if(e||!b.hasOwnProperty(j))i&&typeof c!=="string"?(b[j]||(b[j]={}),K(b[j],c,e,i)):b[j]=c});return b}function s(b,
+c){return function(){return c.apply(b,arguments)}}function Z(b){if(!b)return b;var c=Y;q(b.split("."),function(b){c=c[b]});return c}function $(b,c,e){return function(){var i=fa.call(arguments,0),g;if(e&&x(g=i[i.length-1]))g.__requireJsBuild=!0;i.push(c);return b.apply(null,i)}}function aa(b,c,e){q([["toUrl"],["undef"],["defined","requireDefined"],["specified","requireSpecified"]],function(i){var g=i[1]||i[0];b[i[0]]=c?$(c[g],e):function(){var b=z[O];return b[g].apply(b,arguments)}})}function H(b,
+c,e,i){c=Error(c+"\nhttp://requirejs.org/docs/errors.html#"+b);c.requireType=b;c.requireModules=i;if(e)c.originalError=e;return c}function ga(){if(I&&I.readyState==="interactive")return I;N(document.getElementsByTagName("script"),function(b){if(b.readyState==="interactive")return I=b});return I}var ha=/(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg,ia=/[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g,ba=/\.js$/,ja=/^\.\//,J=Object.prototype.toString,A=Array.prototype,fa=A.slice,ka=A.splice,w=!!(typeof window!==
+"undefined"&&navigator&&document),ca=!w&&typeof importScripts!=="undefined",la=w&&navigator.platform==="PLAYSTATION 3"?/^complete$/:/^(complete|loaded)$/,O="_",S=typeof opera!=="undefined"&&opera.toString()==="[object Opera]",z={},p={},P=[],L=!1,j,t,C,u,D,I,E,da,ea;if(typeof define==="undefined"){if(typeof requirejs!=="undefined"){if(x(requirejs))return;p=requirejs;requirejs=void 0}typeof require!=="undefined"&&!x(require)&&(p=require,require=void 0);j=requirejs=function(b,c,e,i){var g=O,r;!G(b)&&
+typeof b!=="string"&&(r=b,G(c)?(b=c,c=e,e=i):b=[]);if(r&&r.context)g=r.context;(i=z[g])||(i=z[g]=j.s.newContext(g));r&&i.configure(r);return i.require(b,c,e)};j.config=function(b){return j(b)};require||(require=j);j.version="2.0.4";j.jsExtRegExp=/^\/|:|\?|\.js$/;j.isBrowser=w;A=j.s={contexts:z,newContext:function(b){function c(a,d,o){var l=d&&d.split("/"),f=l,b=k.map,c=b&&b["*"],e,g,h;if(a&&a.charAt(0)===".")if(d){f=k.pkgs[d]?l=[d]:l.slice(0,l.length-1);d=a=f.concat(a.split("/"));for(f=0;d[f];f+=
+1)if(e=d[f],e===".")d.splice(f,1),f-=1;else if(e==="..")if(f===1&&(d[2]===".."||d[0]===".."))break;else f>0&&(d.splice(f-1,2),f-=2);f=k.pkgs[d=a[0]];a=a.join("/");f&&a===d+"/"+f.main&&(a=d)}else a.indexOf("./")===0&&(a=a.substring(2));if(o&&(l||c)&&b){d=a.split("/");for(f=d.length;f>0;f-=1){g=d.slice(0,f).join("/");if(l)for(e=l.length;e>0;e-=1)if(o=b[l.slice(0,e).join("/")])if(o=o[g]){h=o;break}!h&&c&&c[g]&&(h=c[g]);if(h){d.splice(0,f,h);a=d.join("/");break}}}return a}function e(a){w&&q(document.getElementsByTagName("script"),
+function(d){if(d.getAttribute("data-requiremodule")===a&&d.getAttribute("data-requirecontext")===h.contextName)return d.parentNode.removeChild(d),!0})}function i(a){var d=k.paths[a];if(d&&G(d)&&d.length>1)return e(a),d.shift(),h.undef(a),h.require([a]),!0}function g(a,d,o,b){var f=a?a.indexOf("!"):-1,v=null,e=d?d.name:null,g=a,i=!0,j="",k,m;a||(i=!1,a="_@r"+(N+=1));f!==-1&&(v=a.substring(0,f),a=a.substring(f+1,a.length));v&&(v=c(v,e,b),m=n[v]);a&&(v?j=m&&m.normalize?m.normalize(a,function(a){return c(a,
+e,b)}):c(a,e,b):(j=c(a,e,b),k=h.nameToUrl(j)));a=v&&!m&&!o?"_unnormalized"+(O+=1):"";return{prefix:v,name:j,parentMap:d,unnormalized:!!a,url:k,originalName:g,isDefine:i,id:(v?v+"!"+j:j)+a}}function r(a){var d=a.id,o=m[d];o||(o=m[d]=new h.Module(a));return o}function p(a,d,o){var b=a.id,f=m[b];if(n.hasOwnProperty(b)&&(!f||f.defineEmitComplete))d==="defined"&&o(n[b]);else r(a).on(d,o)}function B(a,d){var b=a.requireModules,l=!1;if(d)d(a);else if(q(b,function(d){if(d=m[d])d.error=a,d.events.error&&(l=
+!0,d.emit("error",a))}),!l)j.onError(a)}function u(){P.length&&(ka.apply(F,[F.length-1,0].concat(P)),P=[])}function t(a,d,b){a=a&&a.map;d=$(b||h.require,a,d);aa(d,h,a);d.isBrowser=w;return d}function z(a){delete m[a];q(M,function(d,b){if(d.map.id===a)return M.splice(b,1),d.defined||(h.waitCount-=1),!0})}function A(a,d){var b=a.map.id,l=a.depMaps,f;if(a.inited){if(d[b])return a;d[b]=!0;q(l,function(a){if(a=m[a.id])return!a.inited||!a.enabled?(f=null,delete d[b],!0):f=A(a,K({},d))});return f}}function C(a,
+d,b){var l=a.map.id,f=a.depMaps;if(a.inited&&a.map.isDefine){if(d[l])return n[l];d[l]=a;q(f,function(f){var f=f.id,c=m[f];!Q[f]&&c&&(!c.inited||!c.enabled?b[l]=!0:(c=C(c,d,b),b[f]||a.defineDepById(f,c)))});a.check(!0);return n[l]}}function D(a){a.check()}function E(){var a=k.waitSeconds*1E3,d=a&&h.startTime+a<(new Date).getTime(),b=[],l=!1,f=!0,c,g,j;if(!T){T=!0;y(m,function(a){c=a.map;g=c.id;if(a.enabled&&!a.error)if(!a.inited&&d)i(g)?l=j=!0:(b.push(g),e(g));else if(!a.inited&&a.fetched&&c.isDefine&&
+(l=!0,!c.prefix))return f=!1});if(d&&b.length)return a=H("timeout","Load timeout for modules: "+b,null,b),a.contextName=h.contextName,B(a);f&&(q(M,function(a){if(!a.defined){var a=A(a,{}),d={};a&&(C(a,d,{}),y(d,D))}}),y(m,D));if((!d||j)&&l)if((w||ca)&&!U)U=setTimeout(function(){U=0;E()},50);T=!1}}function V(a){r(g(a[0],null,!0)).init(a[1],a[2])}function J(a){var a=a.currentTarget||a.srcElement,d=h.onScriptLoad;a.detachEvent&&!S?a.detachEvent("onreadystatechange",d):a.removeEventListener("load",d,
+!1);d=h.onScriptError;a.detachEvent&&!S||a.removeEventListener("error",d,!1);return{node:a,id:a&&a.getAttribute("data-requiremodule")}}var k={waitSeconds:7,baseUrl:"./",paths:{},pkgs:{},shim:{}},m={},W={},F=[],n={},R={},N=1,O=1,M=[],T,X,h,Q,U;Q={require:function(a){return t(a)},exports:function(a){a.usingExports=!0;if(a.map.isDefine)return a.exports=n[a.map.id]={}},module:function(a){return a.module={id:a.map.id,uri:a.map.url,config:function(){return k.config&&k.config[a.map.id]||{}},exports:n[a.map.id]}}};
+X=function(a){this.events=W[a.id]||{};this.map=a;this.shim=k.shim[a.id];this.depExports=[];this.depMaps=[];this.depMatched=[];this.pluginMaps={};this.depCount=0};X.prototype={init:function(a,d,b,l){l=l||{};if(!this.inited){this.factory=d;if(b)this.on("error",b);else this.events.error&&(b=s(this,function(a){this.emit("error",a)}));this.depMaps=a&&a.slice(0);this.depMaps.rjsSkipMap=a.rjsSkipMap;this.errback=b;this.inited=!0;this.ignore=l.ignore;l.enabled||this.enabled?this.enable():this.check()}},defineDepById:function(a,
+d){var b;q(this.depMaps,function(d,f){if(d.id===a)return b=f,!0});return this.defineDep(b,d)},defineDep:function(a,d){this.depMatched[a]||(this.depMatched[a]=!0,this.depCount-=1,this.depExports[a]=d)},fetch:function(){if(!this.fetched){this.fetched=!0;h.startTime=(new Date).getTime();var a=this.map;if(this.shim)t(this,!0)(this.shim.deps||[],s(this,function(){return a.prefix?this.callPlugin():this.load()}));else return a.prefix?this.callPlugin():this.load()}},load:function(){var a=this.map.url;R[a]||
+(R[a]=!0,h.load(this.map.id,a))},check:function(a){if(this.enabled&&!this.enabling){var d=this.map.id,b=this.depExports,c=this.exports,f=this.factory,e;if(this.inited)if(this.error)this.emit("error",this.error);else{if(!this.defining){this.defining=!0;if(this.depCount<1&&!this.defined){if(x(f)){if(this.events.error)try{c=h.execCb(d,f,b,c)}catch(g){e=g}else c=h.execCb(d,f,b,c);if(this.map.isDefine)if((b=this.module)&&b.exports!==void 0&&b.exports!==this.exports)c=b.exports;else if(c===void 0&&this.usingExports)c=
+this.exports;if(e)return e.requireMap=this.map,e.requireModules=[this.map.id],e.requireType="define",B(this.error=e)}else c=f;this.exports=c;if(this.map.isDefine&&!this.ignore&&(n[d]=c,j.onResourceLoad))j.onResourceLoad(h,this.map,this.depMaps);delete m[d];this.defined=!0;h.waitCount-=1;h.waitCount===0&&(M=[])}this.defining=!1;if(!a&&this.defined&&!this.defineEmitted)this.defineEmitted=!0,this.emit("defined",this.exports),this.defineEmitComplete=!0}}else this.fetch()}},callPlugin:function(){var a=
+this.map,d=a.id,b=g(a.prefix,null,!1,!0);p(b,"defined",s(this,function(b){var f=this.map.name,e=this.map.parentMap?this.map.parentMap.name:null;if(this.map.unnormalized){if(b.normalize&&(f=b.normalize(f,function(a){return c(a,e,!0)})||""),b=g(a.prefix+"!"+f,this.map.parentMap,!1,!0),p(b,"defined",s(this,function(a){this.init([],function(){return a},null,{enabled:!0,ignore:!0})})),b=m[b.id]){if(this.events.error)b.on("error",s(this,function(a){this.emit("error",a)}));b.enable()}}else f=s(this,function(a){this.init([],
+function(){return a},null,{enabled:!0})}),f.error=s(this,function(a){this.inited=!0;this.error=a;a.requireModules=[d];y(m,function(a){a.map.id.indexOf(d+"_unnormalized")===0&&z(a.map.id)});B(a)}),f.fromText=function(a,d){var b=L;b&&(L=!1);r(g(a));j.exec(d);b&&(L=!0);h.completeLoad(a)},b.load(a.name,t(a.parentMap,!0,function(a,d){a.rjsSkipMap=!0;return h.require(a,d)}),f,k)}));h.enable(b,this);this.pluginMaps[b.id]=b},enable:function(){this.enabled=!0;if(!this.waitPushed)M.push(this),h.waitCount+=
+1,this.waitPushed=!0;this.enabling=!0;q(this.depMaps,s(this,function(a,d){var b,c;if(typeof a==="string"){a=g(a,this.map.isDefine?this.map:this.map.parentMap,!1,!this.depMaps.rjsSkipMap);this.depMaps[d]=a;if(b=Q[a.id]){this.depExports[d]=b(this);return}this.depCount+=1;p(a,"defined",s(this,function(a){this.defineDep(d,a);this.check()}));this.errback&&p(a,"error",this.errback)}b=a.id;c=m[b];!Q[b]&&c&&!c.enabled&&h.enable(a,this)}));y(this.pluginMaps,s(this,function(a){var b=m[a.id];b&&!b.enabled&&
+h.enable(a,this)}));this.enabling=!1;this.check()},on:function(a,b){var c=this.events[a];c||(c=this.events[a]=[]);c.push(b)},emit:function(a,b){q(this.events[a],function(a){a(b)});a==="error"&&delete this.events[a]}};return h={config:k,contextName:b,registry:m,defined:n,urlFetched:R,waitCount:0,defQueue:F,Module:X,makeModuleMap:g,configure:function(a){a.baseUrl&&a.baseUrl.charAt(a.baseUrl.length-1)!=="/"&&(a.baseUrl+="/");var b=k.pkgs,c=k.shim,e=k.paths,f=k.map;K(k,a,!0);k.paths=K(e,a.paths,!0);if(a.map)k.map=
+K(f||{},a.map,!0,!0);if(a.shim)y(a.shim,function(a,b){G(a)&&(a={deps:a});if(a.exports&&!a.exports.__buildReady)a.exports=h.makeShimExports(a.exports);c[b]=a}),k.shim=c;if(a.packages)q(a.packages,function(a){a=typeof a==="string"?{name:a}:a;b[a.name]={name:a.name,location:a.location||a.name,main:(a.main||"main").replace(ja,"").replace(ba,"")}}),k.pkgs=b;y(m,function(a,b){a.map=g(b)});if(a.deps||a.callback)h.require(a.deps||[],a.callback)},makeShimExports:function(a){var b;return typeof a==="string"?
+(b=function(){return Z(a)},b.exports=a,b):function(){return a.apply(Y,arguments)}},requireDefined:function(a,b){var c=g(a,b,!1,!0).id;return n.hasOwnProperty(c)},requireSpecified:function(a,b){a=g(a,b,!1,!0).id;return n.hasOwnProperty(a)||m.hasOwnProperty(a)},require:function(a,d,c,e){var f;if(typeof a==="string"){if(x(d))return B(H("requireargs","Invalid require call"),c);if(j.get)return j.get(h,a,d);a=g(a,d,!1,!0);a=a.id;return!n.hasOwnProperty(a)?B(H("notloaded",'Module name "'+a+'" has not been loaded yet for context: '+
+b)):n[a]}c&&!x(c)&&(e=c,c=void 0);d&&!x(d)&&(e=d,d=void 0);for(u();F.length;)if(f=F.shift(),f[0]===null)return B(H("mismatch","Mismatched anonymous define() module: "+f[f.length-1]));else V(f);r(g(null,e)).init(a,d,c,{enabled:!0});E();return h.require},undef:function(a){var b=g(a,null,!0),c=m[a];delete n[a];delete R[b.url];delete W[a];if(c){if(c.events.defined)W[a]=c.events;z(a)}},enable:function(a){m[a.id]&&r(a).enable()},completeLoad:function(a){var b=k.shim[a]||{},c=b.exports&&b.exports.exports,
+e,f;for(u();F.length;){f=F.shift();if(f[0]===null){f[0]=a;if(e)break;e=!0}else f[0]===a&&(e=!0);V(f)}f=m[a];if(!e&&!n[a]&&f&&!f.inited)if(k.enforceDefine&&(!c||!Z(c)))if(i(a))return;else return B(H("nodefine","No define call for "+a,null,[a]));else V([a,b.deps||[],b.exports]);E()},toUrl:function(a,b){var e=a.lastIndexOf("."),g=null;e!==-1&&(g=a.substring(e,a.length),a=a.substring(0,e));return h.nameToUrl(c(a,b&&b.id,!0),g)},nameToUrl:function(a,b){var c,e,f,g,h,i;if(j.jsExtRegExp.test(a))g=a+(b||
+"");else{c=k.paths;e=k.pkgs;g=a.split("/");for(h=g.length;h>0;h-=1)if(i=g.slice(0,h).join("/"),f=e[i],i=c[i]){G(i)&&(i=i[0]);g.splice(0,h,i);break}else if(f){c=a===f.name?f.location+"/"+f.main:f.location;g.splice(0,h,c);break}g=g.join("/")+(b||".js");g=(g.charAt(0)==="/"||g.match(/^[\w\+\.\-]+:/)?"":k.baseUrl)+g}return k.urlArgs?g+((g.indexOf("?")===-1?"?":"&")+k.urlArgs):g},load:function(a,b){j.load(h,a,b)},execCb:function(a,b,c,e){return b.apply(e,c)},onScriptLoad:function(a){if(a.type==="load"||
+la.test((a.currentTarget||a.srcElement).readyState))I=null,a=J(a),h.completeLoad(a.id)},onScriptError:function(a){var b=J(a);if(!i(b.id))return B(H("scripterror","Script error",a,[b.id]))}}}};j({});aa(j);if(w&&(t=A.head=document.getElementsByTagName("head")[0],C=document.getElementsByTagName("base")[0]))t=A.head=C.parentNode;j.onError=function(b){throw b;};j.load=function(b,c,e){var i=b&&b.config||{},g;if(w)return g=i.xhtml?document.createElementNS("http://www.w3.org/1999/xhtml","html:script"):document.createElement("script"),
+g.type=i.scriptType||"text/javascript",g.charset="utf-8",g.async=!0,g.setAttribute("data-requirecontext",b.contextName),g.setAttribute("data-requiremodule",c),g.attachEvent&&!(g.attachEvent.toString&&g.attachEvent.toString().indexOf("[native code")<0)&&!S?(L=!0,g.attachEvent("onreadystatechange",b.onScriptLoad)):(g.addEventListener("load",b.onScriptLoad,!1),g.addEventListener("error",b.onScriptError,!1)),g.src=e,E=g,C?t.insertBefore(g,C):t.appendChild(g),E=null,g;else ca&&(importScripts(e),b.completeLoad(c))};
+w&&N(document.getElementsByTagName("script"),function(b){if(!t)t=b.parentNode;if(u=b.getAttribute("data-main")){if(!p.baseUrl)D=u.split("/"),da=D.pop(),ea=D.length?D.join("/")+"/":"./",p.baseUrl=ea,u=da;u=u.replace(ba,"");p.deps=p.deps?p.deps.concat(u):[u];return!0}});define=function(b,c,e){var i,g;typeof b!=="string"&&(e=c,c=b,b=null);G(c)||(e=c,c=[]);!c.length&&x(e)&&e.length&&(e.toString().replace(ha,"").replace(ia,function(b,e){c.push(e)}),c=(e.length===1?["require"]:["require","exports","module"]).concat(c));
+if(L&&(i=E||ga()))b||(b=i.getAttribute("data-requiremodule")),g=z[i.getAttribute("data-requirecontext")];(g?g.defQueue:P).push([b,c,e])};define.amd={jQuery:!0};j.exec=function(b){return eval(b)};j(p)}})(this);
diff --git a/samples/Cellar/CellarServer/Content/site.css b/samples/Cellar/CellarServer/Content/site.css
new file mode 100644
index 000000000..3a4dc9039
--- /dev/null
+++ b/samples/Cellar/CellarServer/Content/site.css
@@ -0,0 +1,202 @@
+* {
+  margin: 0px;
+  padding: 0px;
+  box-sizing: border-box;
+}
+html, body {
+  width: 100%;
+  height: 100%;
+}
+body.home {
+  background-image: url(images/bg.jpg);
+  background-repeat: no-repeat;
+  background-size: cover;
+  overflow: hidden;
+}
+h1, h2 {
+  font-family: 'Segoe UI', 'Trebuchet MS', Helvetica;
+  font-weight: normal;
+  -webkit-font-smoothing: antialiased;
+}
+#banner {
+  padding: 20px;
+  margin-top: 200px;
+  text-align: center;
+  background-color: rgba(0,0,0,.5);
+  color: white;
+}
+#commands {
+  padding: 20px;
+  margin-top: 20px;
+  text-align: center;
+}
+#commands a {
+  width: 160px;
+  height: 58px;
+  margin: 10px 4px;
+  color: #333;
+  display: inline-block;
+  padding: 9px 14px;
+  border-radius: 5px;
+  background-color: rgba(245, 245, 245, .9);
+  text-shadow: rgba(0, 0, 0, 0.25) 0px 0px 2px;
+  text-decoration: none;
+  cursor: pointer;
+  font-family: 'Segoe UI', Georgia;
+  font-size: 16px;
+  -webkit-font-smoothing: antialiased;
+}
+#commands a:hover {
+  background-color: rgba(190, 138, 88, .9);
+}
+#commands a img {
+  float: left;
+}
+
+header {
+  background-image: url(images/bg.jpg);
+  background-repeat: no-repeat;
+  background-size: cover;
+}
+header div {
+  background-color: rgba(0,0,0,.75);
+  color: #fff;
+  padding: 10px;
+}
+header a {
+  color: #fff;
+  text-decoration: none;
+}
+section.main {
+  text-align: center;
+}
+footer {
+  text-align: center;
+}
+
+#wineList {
+  list-style-type: none;
+}
+#wineList li {
+  display: inline-block;
+}
+#wineList a {
+  padding: 10px 0px;
+  margin: 10px 0px;
+  border: none;
+  background: none;
+  cursor: pointer;
+  font-size: 0px;
+  border: solid 1px white;
+  border-radius: 4px;
+  display: inline-block;
+}
+#wineList a:hover {
+  border-color: rgb(203, 232, 246);
+  box-shadow: rgba(0,0,0,.25) 0px 0px 10px;
+}
+#wineList a img {
+  width: 250px;
+  height: 300px;
+}
+footer button {
+  width: 160px;
+  height: 40px;
+  margin: 10px 4px;
+  color: #333;
+  display: inline-block;
+  padding: 9px 14px;
+  border: none;
+  border-radius: 5px;
+  background-color: rgba(245, 245, 245, .9);
+  text-decoration: none;
+  vertical-align: middle;
+  cursor: pointer;
+  font-family: 'Segoe UI', Georgia;
+  font-size: 14px;
+  -webkit-font-smoothing: antialiased;
+}
+footer button:hover {
+  background-color: rgb(203, 232, 246);
+  box-shadow: rgba(0,0,0,.25) 0px 0px 10px;
+}
+footer button:disabled {
+  background-color: rgba(245, 245, 245, .9);
+  box-shadow: none;
+  color: #aaa;
+}
+
+#wineDetail {
+  font-family: 'Segoe UI', Georgia;
+  text-align: left;
+  padding-right: 0px;
+}
+#wineDetail h3 {
+  font-weight: normal;
+  font-size: 16px;
+  font-variant: small-caps;
+}
+#wineDetail img {
+  float: right;
+}
+#wineDetail p {
+  margin-top: 20px;
+}
+
+.reveal-modal-bg {
+  position: fixed;
+  height: 100%;
+  width: 100%;
+  background: #000;
+  background: rgba(0,0,0,.8);
+  z-index: 100;
+  display: none;
+  top: 0;
+  left: 0;
+}
+
+.reveal-modal {
+  visibility: hidden;
+  top: 100px;
+  left: 50%;
+  margin-left: -300px;
+  width: 520px;
+  background-color: white;
+  position: absolute;
+  z-index: 101;
+  padding: 30px 40px 34px;
+  border-radius: 5px;
+  box-shadow: 0 0 10px rgba(0,0,0,.4);
+}
+
+.reveal-modal.small {
+  width: 200px;
+  margin-left: -140px;
+}
+
+.reveal-modal.medium {
+  width: 400px;
+  margin-left: -240px;
+}
+
+.reveal-modal.large {
+  width: 600px;
+  margin-left: -340px;
+}
+
+.reveal-modal.xlarge {
+  width: 800px;
+  margin-left: -440px;
+}
+
+.reveal-modal .close-reveal-modal {
+  font-size: 22px;
+  line-height: .5;
+  position: absolute;
+  top: 8px;
+  right: 11px;
+  color: #aaa;
+  text-shadow: 0 -1px 1px rbga(0,0,0,.6);
+  font-weight: bold;
+  cursor: pointer;
+}
diff --git a/samples/Cellar/CellarServer/Content/wines/argiano.jpg b/samples/Cellar/CellarServer/Content/wines/argiano.jpg
new file mode 100644
index 000000000..c766c68e1
Binary files /dev/null and b/samples/Cellar/CellarServer/Content/wines/argiano.jpg differ
diff --git a/samples/Cellar/CellarServer/Content/wines/block_nine.jpg b/samples/Cellar/CellarServer/Content/wines/block_nine.jpg
new file mode 100644
index 000000000..34710e115
Binary files /dev/null and b/samples/Cellar/CellarServer/Content/wines/block_nine.jpg differ
diff --git a/samples/Cellar/CellarServer/Content/wines/bodega_lurton.jpg b/samples/Cellar/CellarServer/Content/wines/bodega_lurton.jpg
new file mode 100644
index 000000000..731f3ac2e
Binary files /dev/null and b/samples/Cellar/CellarServer/Content/wines/bodega_lurton.jpg differ
diff --git a/samples/Cellar/CellarServer/Content/wines/bouscat.jpg b/samples/Cellar/CellarServer/Content/wines/bouscat.jpg
new file mode 100644
index 000000000..c24c7ce8f
Binary files /dev/null and b/samples/Cellar/CellarServer/Content/wines/bouscat.jpg differ
diff --git a/samples/Cellar/CellarServer/Content/wines/calera.jpg b/samples/Cellar/CellarServer/Content/wines/calera.jpg
new file mode 100644
index 000000000..78cee75c5
Binary files /dev/null and b/samples/Cellar/CellarServer/Content/wines/calera.jpg differ
diff --git a/samples/Cellar/CellarServer/Content/wines/caronne.jpg b/samples/Cellar/CellarServer/Content/wines/caronne.jpg
new file mode 100644
index 000000000..b6ed6f68c
Binary files /dev/null and b/samples/Cellar/CellarServer/Content/wines/caronne.jpg differ
diff --git a/samples/Cellar/CellarServer/Content/wines/dinastia.jpg b/samples/Cellar/CellarServer/Content/wines/dinastia.jpg
new file mode 100644
index 000000000..f01f84582
Binary files /dev/null and b/samples/Cellar/CellarServer/Content/wines/dinastia.jpg differ
diff --git a/samples/Cellar/CellarServer/Content/wines/domaine_serene.jpg b/samples/Cellar/CellarServer/Content/wines/domaine_serene.jpg
new file mode 100644
index 000000000..492ee947f
Binary files /dev/null and b/samples/Cellar/CellarServer/Content/wines/domaine_serene.jpg differ
diff --git a/samples/Cellar/CellarServer/Content/wines/ex_umbris.jpg b/samples/Cellar/CellarServer/Content/wines/ex_umbris.jpg
new file mode 100644
index 000000000..456919734
Binary files /dev/null and b/samples/Cellar/CellarServer/Content/wines/ex_umbris.jpg differ
diff --git a/samples/Cellar/CellarServer/Content/wines/fourvines.jpg b/samples/Cellar/CellarServer/Content/wines/fourvines.jpg
new file mode 100644
index 000000000..492106747
Binary files /dev/null and b/samples/Cellar/CellarServer/Content/wines/fourvines.jpg differ
diff --git a/samples/Cellar/CellarServer/Content/wines/hugel.jpg b/samples/Cellar/CellarServer/Content/wines/hugel.jpg
new file mode 100644
index 000000000..00371213c
Binary files /dev/null and b/samples/Cellar/CellarServer/Content/wines/hugel.jpg differ
diff --git a/samples/Cellar/CellarServer/Content/wines/lan_rioja.jpg b/samples/Cellar/CellarServer/Content/wines/lan_rioja.jpg
new file mode 100644
index 000000000..c2bce57f8
Binary files /dev/null and b/samples/Cellar/CellarServer/Content/wines/lan_rioja.jpg differ
diff --git a/samples/Cellar/CellarServer/Content/wines/le_doyenne.jpg b/samples/Cellar/CellarServer/Content/wines/le_doyenne.jpg
new file mode 100644
index 000000000..da5b5b3aa
Binary files /dev/null and b/samples/Cellar/CellarServer/Content/wines/le_doyenne.jpg differ
diff --git a/samples/Cellar/CellarServer/Content/wines/margerum.jpg b/samples/Cellar/CellarServer/Content/wines/margerum.jpg
new file mode 100644
index 000000000..4f59af8ef
Binary files /dev/null and b/samples/Cellar/CellarServer/Content/wines/margerum.jpg differ
diff --git a/samples/Cellar/CellarServer/Content/wines/momo.jpg b/samples/Cellar/CellarServer/Content/wines/momo.jpg
new file mode 100644
index 000000000..7d65f1afb
Binary files /dev/null and b/samples/Cellar/CellarServer/Content/wines/momo.jpg differ
diff --git a/samples/Cellar/CellarServer/Content/wines/morizottes.jpg b/samples/Cellar/CellarServer/Content/wines/morizottes.jpg
new file mode 100644
index 000000000..9b0819621
Binary files /dev/null and b/samples/Cellar/CellarServer/Content/wines/morizottes.jpg differ
diff --git a/samples/Cellar/CellarServer/Content/wines/petalos.jpg b/samples/Cellar/CellarServer/Content/wines/petalos.jpg
new file mode 100644
index 000000000..2634e3a1d
Binary files /dev/null and b/samples/Cellar/CellarServer/Content/wines/petalos.jpg differ
diff --git a/samples/Cellar/CellarServer/Content/wines/ponzi.jpg b/samples/Cellar/CellarServer/Content/wines/ponzi.jpg
new file mode 100644
index 000000000..b4f824f04
Binary files /dev/null and b/samples/Cellar/CellarServer/Content/wines/ponzi.jpg differ
diff --git a/samples/Cellar/CellarServer/Content/wines/quivira.jpg b/samples/Cellar/CellarServer/Content/wines/quivira.jpg
new file mode 100644
index 000000000..0c9bfe994
Binary files /dev/null and b/samples/Cellar/CellarServer/Content/wines/quivira.jpg differ
diff --git a/samples/Cellar/CellarServer/Content/wines/rex_hill.jpg b/samples/Cellar/CellarServer/Content/wines/rex_hill.jpg
new file mode 100644
index 000000000..cb3b46993
Binary files /dev/null and b/samples/Cellar/CellarServer/Content/wines/rex_hill.jpg differ
diff --git a/samples/Cellar/CellarServer/Content/wines/saint_cosme.jpg b/samples/Cellar/CellarServer/Content/wines/saint_cosme.jpg
new file mode 100644
index 000000000..72ae561ea
Binary files /dev/null and b/samples/Cellar/CellarServer/Content/wines/saint_cosme.jpg differ
diff --git a/samples/Cellar/CellarServer/Content/wines/shafer.jpg b/samples/Cellar/CellarServer/Content/wines/shafer.jpg
new file mode 100644
index 000000000..9424830be
Binary files /dev/null and b/samples/Cellar/CellarServer/Content/wines/shafer.jpg differ
diff --git a/samples/Cellar/CellarServer/Content/wines/viticcio.jpg b/samples/Cellar/CellarServer/Content/wines/viticcio.jpg
new file mode 100644
index 000000000..f0f405c00
Binary files /dev/null and b/samples/Cellar/CellarServer/Content/wines/viticcio.jpg differ
diff --git a/samples/Cellar/CellarServer/Content/wines/waterbrook.jpg b/samples/Cellar/CellarServer/Content/wines/waterbrook.jpg
new file mode 100644
index 000000000..b8325af8c
Binary files /dev/null and b/samples/Cellar/CellarServer/Content/wines/waterbrook.jpg differ
diff --git a/samples/Cellar/CellarServer/Controllers/WinesController.cs b/samples/Cellar/CellarServer/Controllers/WinesController.cs
new file mode 100644
index 000000000..ea9b0ece0
--- /dev/null
+++ b/samples/Cellar/CellarServer/Controllers/WinesController.cs
@@ -0,0 +1,77 @@
+// WinesController.cs
+//
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using Cellar.DataModels;
+using Cellar.Services;
+using NodeApi.ExpressJS;
+using NodeApi.Network;
+
+namespace Cellar.Controllers {
+
+    public sealed class WinesController {
+
+        private IWineRepository _repository;
+
+        public WinesController(IWineRepository repository) {
+            _repository = repository;
+        }
+
+        public void LookupWine(ExpressServerRequest request, ExpressServerResponse response) {
+            int id = Number.ParseInt(request.Parameters["id"], 10);
+            if (Number.IsNaN(id)) {
+                response.Send(HttpStatusCode.BadRequest);
+                return;
+            }
+
+            _repository.LookupWine(id)
+                .Done(delegate(Wine wine) {
+                    response.SetType("json");
+                    response.SendJson(wine);
+                })
+                .Fail(delegate(Exception error) {
+                    response.Send(HttpStatusCode.NotFound);
+                });
+        }
+
+        public void QueryWines(ExpressServerRequest request, ExpressServerResponse response) {
+            int skip = 0;
+            int count = 8;
+
+            if (request.Query.ContainsKey("skip")) {
+                skip = Number.ParseInt(request.Query["skip"], 10);
+            }
+            if (request.Query.ContainsKey("count")) {
+                count = Number.ParseInt(request.Query["count"], 10);
+            }
+
+            if (Number.IsNaN(skip) || Number.IsNaN(count)) {
+                response.Send(HttpStatusCode.BadRequest);
+                return;
+            }
+
+            Dictionary<string, object> data = new Dictionary<string, object>();
+            Task dataTask = _repository.QueryWines(skip, count)
+                .Done(delegate(Wine[] wines) {
+                    data["wines"] = wines;
+                });
+
+            if (skip == 0) {
+                dataTask = Task.All(dataTask,
+                    _repository.CountWines().Done(delegate(int totalCount) {
+                        data["count"] = totalCount;
+                    }));
+            }
+
+            dataTask.Done(delegate() {
+                response.SetType("json");
+                response.SendJson(data);
+            })
+            .Fail(delegate(Exception error) {
+                response.Send(HttpStatusCode.InternalServerError);
+            });
+        }
+    }
+}
diff --git a/samples/Cellar/CellarServer/DataModels/Wine.cs b/samples/Cellar/CellarServer/DataModels/Wine.cs
new file mode 100644
index 000000000..fb14f756c
--- /dev/null
+++ b/samples/Cellar/CellarServer/DataModels/Wine.cs
@@ -0,0 +1,33 @@
+// Wine.cs
+//
+
+using System;
+using System.Collections.Generic;
+
+namespace Cellar.DataModels {
+
+    [ScriptObject]
+    public sealed class Wine {
+
+        [ScriptName("_id")]
+        public int ID;
+        public string Name;
+        public int Year;
+        public string Grapes;
+        public string Country;
+        public string Region;
+        public string Description;
+        public string Image;
+
+        public Wine(int id, string name, int year, string grapes, string country, string region, string description, string image) {
+            ID = id;
+            Name = name;
+            Year = year;
+            Grapes = grapes;
+            Country = country;
+            Region = region;
+            Description = description;
+            Image = image;
+        }
+    }
+}
diff --git a/samples/Cellar/CellarServer/Properties/AssemblyInfo.cs b/samples/Cellar/CellarServer/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..5b3f61d42
--- /dev/null
+++ b/samples/Cellar/CellarServer/Properties/AssemblyInfo.cs
@@ -0,0 +1,31 @@
+// AssemblyInfo.cs
+//
+
+using System;
+using System.Reflection;
+
+// 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("cellar.server")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Cellar Sample for Script#")]
+[assembly: AssemblyCopyright("Copyright © 2012")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
+
+[assembly: ScriptAssembly("Cellar.Server")]
+
+// A script template allows customization of the generated script.
+[assembly: ScriptTemplate(@"
+// {name}.js {version}
+
+{dependenciesLookup}
+var $global = this;
+
+{script}
+")]
diff --git a/samples/Cellar/CellarServer/Properties/FxCop.ruleset b/samples/Cellar/CellarServer/Properties/FxCop.ruleset
new file mode 100644
index 000000000..47c160f61
--- /dev/null
+++ b/samples/Cellar/CellarServer/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/Cellar/CellarServer/Server.cs b/samples/Cellar/CellarServer/Server.cs
new file mode 100644
index 000000000..017afe1f4
--- /dev/null
+++ b/samples/Cellar/CellarServer/Server.cs
@@ -0,0 +1,48 @@
+// Server.cs
+//
+
+using System;
+using System.Diagnostics;
+using NodeApi;
+using NodeApi.ExpressJS;
+using Cellar;
+using Cellar.Controllers;
+
+[ScriptModule]
+internal static class Server {
+
+    static Server() {
+        string dbUrl = Node.Process.Arguments[2];
+        if (String.IsNullOrEmpty(dbUrl)) {
+            Debug.WriteLine("Usage: node cellar.server.js <database url>");
+            Debug.WriteLine("Format of database url:");
+            Debug.WriteLine("  mongodb://user:password@host:port/database");
+            Debug.WriteLine(String.Empty);
+            return;
+        }
+
+        CellarApplication cellarApplication = new CellarApplication();
+        cellarApplication.Initialize(dbUrl, delegate(Exception initializationError) {
+            if (initializationError != null) {
+                Debug.WriteLine(initializationError.ToString());
+                return;
+            }
+
+            Debug.WriteLine("Starting web application on port 8080...");
+            string path = (string)Script.Literal("__dirname");
+
+            ExpressApplication app = Express.Application();
+            app.Use(Express.Static(path + "\\Content"));
+            app.Get("/wines/:id", delegate(ExpressServerRequest request, ExpressServerResponse response) {
+                   WinesController controller = cellarApplication.CreateWinesController();
+                   controller.LookupWine(request, response);
+               })
+               .Get("/wines", delegate(ExpressServerRequest request, ExpressServerResponse response) {
+                   WinesController controller = cellarApplication.CreateWinesController();
+                   controller.QueryWines(request, response);
+               });
+
+            app.Listen(8080);
+        });
+    }
+}
diff --git a/samples/Cellar/CellarServer/Services/IWineRepository.cs b/samples/Cellar/CellarServer/Services/IWineRepository.cs
new file mode 100644
index 000000000..816f6bf24
--- /dev/null
+++ b/samples/Cellar/CellarServer/Services/IWineRepository.cs
@@ -0,0 +1,20 @@
+// IWineRepository.cs
+//
+
+using System;
+using System.Threading;
+using Cellar.DataModels;
+
+namespace Cellar.Services {
+
+    public interface IWineRepository {
+
+        Task<int> CountWines();
+
+        Task InsertWines(Wine[] wines);
+
+        Task<Wine> LookupWine(int id);
+
+        Task<Wine[]> QueryWines(int skip, int count);
+    }
+}
diff --git a/samples/Cellar/CellarServer/Services/MongoLab/MongoWineRepository.cs b/samples/Cellar/CellarServer/Services/MongoLab/MongoWineRepository.cs
new file mode 100644
index 000000000..3f7e18614
--- /dev/null
+++ b/samples/Cellar/CellarServer/Services/MongoLab/MongoWineRepository.cs
@@ -0,0 +1,120 @@
+// MongoWineRepository.cs
+//
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Threading;
+using Cellar.DataModels;
+using NodeApi.MongoDB;
+
+namespace Cellar.Services.MongoLab {
+
+    internal sealed class MongoWineRepository : IWineRepository {
+
+        private MongoDatabase _database;
+        private MongoCollection _winesCollection;
+
+        private MongoWineRepository(MongoDatabase database, MongoCollection winesCollection) {
+            _database = database;
+            _winesCollection = winesCollection;
+        }
+
+        public Task<int> CountWines() {
+            Deferred<int> deferred = Deferred.Create<int>();
+
+            _winesCollection.Count(delegate(Exception error, int count) {
+                if (error == null) {
+                    deferred.Resolve(count);
+                    return;
+                }
+
+                deferred.Reject(error);
+            });
+
+            return deferred.Task;
+        }
+
+        public static Task<MongoWineRepository> Create(string dbHost, int dbPort, string dbName, string userName, string password) {
+            Deferred<MongoWineRepository> deferred = Deferred.Create<MongoWineRepository>();
+
+            Dictionary<string, object> serverOptions = new Dictionary<string, object>("auto_reconnect", true);
+            Dictionary<string, object> dbOptions = new Dictionary<string, object>("w", "0");
+
+            MongoServer dbServer = new MongoServer(dbHost, dbPort, serverOptions);
+            MongoConnector dbConnector = new MongoConnector(dbName, dbServer, dbOptions);
+
+            dbConnector.Open(delegate(Exception openError, MongoDatabase db) {
+                db.Authenticate(userName, password, delegate(Exception authError, bool success) {
+                    if (success) {
+                        db.CreateCollection("wines", delegate(Exception collectionError, MongoCollection collection) {
+                            if (collection != null) {
+                                MongoWineRepository repository = new MongoWineRepository(db, collection);
+                                deferred.Resolve(repository);
+                            }
+                            else {
+                                deferred.Reject();
+                            }
+                        });
+                    }
+                    else {
+                        deferred.Reject();
+                    }
+                });
+            });
+
+            return deferred.Task;
+        }
+
+        public Task InsertWines(Wine[] wines) {
+            Deferred deferred = Deferred.Create();
+
+            _winesCollection.Insert(wines, null, delegate(Exception error) {
+                if (error == null) {
+                    deferred.Resolve();
+                    return;
+                }
+
+                deferred.Reject(error);
+            });
+
+            return deferred.Task;
+        }
+
+        public Task<Wine> LookupWine(int id) {
+            Deferred<Wine> deferred = Deferred.Create<Wine>();
+
+            Dictionary<string, object> query = new Dictionary<string, object>("_id", id);
+            _winesCollection.FindOne(query,
+                delegate(Exception error, object item) {
+                    if (error == null) {
+                        deferred.Resolve((Wine)item);
+                        return;
+                    }
+
+                    deferred.Reject(error);
+                });
+
+            return deferred.Task;
+        }
+
+        public Task<Wine[]> QueryWines(int skip, int count) {
+            Deferred<Wine[]> deferred = Deferred.Create<Wine[]>();
+
+            MongoCursor cursor = _winesCollection.Find(null)
+                                                 .Sort(new object[] { "_id" })
+                                                 .Skip(skip).Limit(count);
+
+            cursor.ToArray(delegate(Exception error, object[] items) {
+                if (error == null) {
+                    deferred.Resolve((Wine[])items);
+                    return;
+                }
+
+                deferred.Reject(error);
+            });
+
+            return deferred.Task;
+        }
+    }
+}
diff --git a/samples/Cellar/CellarServer/data.json b/samples/Cellar/CellarServer/data.json
new file mode 100644
index 000000000..1bac906bb
--- /dev/null
+++ b/samples/Cellar/CellarServer/data.json
@@ -0,0 +1,242 @@
+[
+    {
+        "_id": 1,
+        "name": "Chateau de Saint Cosme",
+        "year": "2009",
+        "grapes": "Grenache / Syrah",
+        "country": "France",
+        "region": "Southern Rhone",
+        "description": "The aromas of fruit and spice give one a hint of the light drinkability of this lovely wine, which makes an excellent complement to fish dishes.",
+        "image": "saint_cosme.jpg"
+    },
+    {
+        "_id": 2,
+        "name": "Lan Rioja Crianza",
+        "year": "2006",
+        "grapes": "Tempranillo",
+        "country": "Spain",
+        "region": "Rioja",
+        "description": "A resurgence of interest in boutique vineyards has opened the door for this excellent foray into the dessert wine market. Light and bouncy, with a hint of black truffle, this wine will not fail to tickle the taste buds.",
+        "image": "lan_rioja.jpg"
+    },
+    {
+        "_id": 3,
+        "name": "Margerum Sybarite",
+        "year": "2010",
+        "grapes": "Sauvignon Blanc",
+        "country": "USA",
+        "region": "California Central Cosat",
+        "description": "The cache of a fine Cabernet in ones wine cellar can now be replaced with a childishly playful wine bubbling over with tempting tastes of black cherry and licorice. This is a taste sure to transport you back in time.",
+        "image": "margerum.jpg"
+    },
+    {
+        "_id": 4,
+        "name": "Owen Roe \"Ex Umbris\"",
+        "year": "2009",
+        "grapes": "Syrah",
+        "country": "USA",
+        "region": "Washington",
+        "description": "A one-two punch of black pepper and jalapeno will send your senses reeling, as the orange essence snaps you back to reality. Don't miss this award-winning taste sensation.",
+        "image": "ex_umbris.jpg"
+    },
+    {
+        "_id": 5,
+        "name": "Rex Hill",
+        "year": "2009",
+        "grapes": "Pinot Noir",
+        "country": "USA",
+        "region": "Oregon",
+        "description": "One cannot doubt that this will be the wine served at the Hollywood award shows, because it has undeniable star power. Be the first to catch the debut that everyone will be talking about tomorrow.",
+        "image": "rex_hill.jpg"
+    },
+    {
+        "_id": 6,
+        "name": "Viticcio Classico Riserva",
+        "year": "2007",
+        "grapes": "Sangiovese Merlot",
+        "country": "Italy",
+        "region": "Tuscany",
+        "description": "Though soft and rounded in texture, the body of this wine is full and rich and oh-so-appealing. This delivery is even more impressive when one takes note of the tender tannins that leave the taste buds wholly satisfied.",
+        "image": "viticcio.jpg"
+    },
+    {
+        "_id": 7,
+        "name": "Chateau le Doyenne",
+        "year": "2005",
+        "grapes": "Merlot",
+        "country": "France",
+        "region": "Bordeaux",
+        "description": "Though dense and chewy, this wine does not overpower with its finely balanced depth and structure. It is a truly luxurious experience for the senses.",
+        "image": "le_doyenne.jpg"
+    },
+    {
+        "_id": 8,
+        "name": "Domaine du Bouscat",
+        "year": "2009",
+        "grapes": "Merlot",
+        "country": "France",
+        "region": "Bordeaux",
+        "description": "The light golden color of this wine belies the bright flavor it holds. A true summer wine, it begs for a picnic lunch in a sun-soaked vineyard.",
+        "image": "bouscat.jpg"
+    },
+    {
+        "_id": 9,
+        "name": "Block Nine",
+        "year": "2009",
+        "grapes": "Pinot Noir",
+        "country": "USA",
+        "region": "California",
+        "description": "With hints of ginger and spice, this wine makes an excellent complement to light appetizer and dessert fare for a holiday gathering.",
+        "image": "block_nine.jpg"
+    },
+    {
+        "_id": 10,
+        "name": "Domaine Serene",
+        "year": "2007",
+        "grapes": "Pinot Noir",
+        "country": "USA",
+        "region": "Oregon",
+        "description": "Though subtle in its complexities, this wine is sure to please a wide range of enthusiasts. Notes of pomegranate will delight as the nutty finish completes the picture of a fine sipping experience.",
+        "image": "domaine_serene.jpg"
+    },
+    {
+        "_id": 11,
+        "name": "Bidega Lurton",
+        "year": "2011",
+        "grapes": "Pinot Gris",
+        "country": "Argentina",
+        "region": "Mendoza",
+        "description": "Solid notes of black currant blended with a light citrus make this wine an easy pour for varied palates.",
+        "image": "bodega_lurton.jpg"
+    },
+    {
+        "_id": 12,
+        "name": "Les Morizottes",
+        "year": "2009",
+        "grapes": "Chardonnay",
+        "country": "France",
+        "region": "Burgundy",
+        "description": "Breaking the mold of the classics, this offering will surprise and undoubtedly get tongues wagging with the hints of coffee and tobacco in perfect alignment with more traditional notes. Sure to please the late-night crowd with the slight jolt of adrenaline it brings.",
+        "image": "morizottes.jpg"
+    },
+    {
+        "_id": 13,
+        "name": "Argiano non Confunditur",
+        "year": "2009",
+        "grapes": "Cabernet Sauvignon",
+        "country": "Italy",
+        "region": "Tuscany",
+        "description": "Like a symphony, this cabernet has a wide range of notes that will delight the taste buds and linger in the mind.",
+        "image": "argiano.jpg"
+    },
+    {
+        "_id": 14,
+        "name": "Dinastia Vivanco ",
+        "year": "2008",
+        "grapes": "Tempranillo",
+        "country": "Spain",
+        "region": "Rioja",
+        "description": "Whether enjoying a fine cigar or a nicotine patch, don't pass up a taste of this hearty Rioja, both smooth and robust.",
+        "image": "dinastia.jpg"
+    },
+    {
+        "_id": 15,
+        "name": "Petalos Bierzo",
+        "year": "2009",
+        "grapes": "Mencia",
+        "country": "Spain",
+        "region": "Castilla y Leon",
+        "description": "For the first time, a blend of grapes from two different regions have been combined in an outrageous explosion of flavor that cannot be missed.",
+        "image": "petalos.jpg"
+    },
+    {
+        "_id": 16,
+        "name": "Shafer Red Shoulder Ranch",
+        "year": "2009",
+        "grapes": "Chardonnay",
+        "country": "USA",
+        "region": "California",
+        "description": "Keep an eye out for this winery in coming years, as their chardonnays have reached the peak of perfection.",
+        "image": "shafer.jpg"
+    },
+    {
+        "_id": 17,
+        "name": "Ponzi",
+        "year": "2010",
+        "grapes": "Pinot Gris",
+        "country": "USA",
+        "region": "Oregon",
+        "description": "For those who appreciate the simpler pleasures in life, this light pinot grigio will blend perfectly with a light meal or as an after dinner drink.",
+        "image": "ponzi.jpg"
+    },
+    {
+        "_id": 18,
+        "name": "Hugel",
+        "year": "2010",
+        "grapes": "Pinot Gris",
+        "country": "France",
+        "region": "Alsace",
+        "description": "Fresh as new buds on a spring vine, this dewy offering is the finest of the new generation of pinot grigios.  Enjoy it with a friend and a crown of flowers for the ultimate wine tasting experience.",
+        "image": "hugel.jpg"
+    },
+    {
+        "_id": 19,
+        "name": "Four Vines Maverick",
+        "year": "2011",
+        "grapes": "Zinfandel",
+        "country": "USA",
+        "region": "California",
+        "description": "o yourself a favor and have a bottle (or two) of this fine zinfandel on hand for your next romantic outing.  The only thing that can make this fine choice better is the company you share it with.",
+        "image": "fourvines.jpg"
+    },
+    {
+        "_id": 20,
+        "name": "Quivira Dry Creek Valley",
+        "year": "2009",
+        "grapes": "Zinfandel",
+        "country": "USA",
+        "region": "California",
+        "description": "Rarely do you find a zinfandel this oakey from the Sonoma region. The vintners have gone to extremes to duplicate the classic flavors that brought high praise in the early '90s.",
+        "image": "quivira.jpg"
+    },
+    {
+        "_id": 21,
+        "name": "Calera 35th Anniversary",
+        "year": "2010",
+        "grapes": "Pinot Noir",
+        "country": "USA",
+        "region": "California",
+        "description": "Fruity and bouncy, with a hint of spice, this pinot noir is an excellent candidate for best newcomer from Napa this year.",
+        "image": "calera.jpg"
+    },
+    {
+        "_id": 22,
+        "name": "Chateau Caronne Ste Gemme",
+        "year": "2010",
+        "grapes": "Cabernet Sauvignon",
+        "country": "France",
+        "region": "Bordeaux",
+        "description": "Find a sommelier with a taste for chocolate and he's guaranteed to have this cabernet on his must-have list.",
+        "image": "caronne.jpg"
+    },
+    {
+        "_id": 23,
+        "name": "Momo Marlborough",
+        "year": "2010",
+        "grapes": "Sauvignon Blanc",
+        "country": "New Zealand",
+        "region": "South Island",
+        "description": "Best served chilled with melon or a nice salty prosciutto, this sauvignon blanc is a staple in every Italian kitchen, if not on their wine list.  Request the best, and you just may get it.",
+        "image": "momo.jpg"
+    },
+    {
+        "_id": 24,
+        "name": "Waterbrook",
+        "year": "2009",
+        "grapes": "Merlot",
+        "country": "USA",
+        "region": "Washington",
+        "description": "Legend has it the gods didn't share their ambrosia with mere mortals.  This merlot may be the closest we've ever come to a taste of heaven.",
+        "image": "waterbrook.jpg"
+    }
+]
diff --git a/samples/Cellar/CellarServer/package.json b/samples/Cellar/CellarServer/package.json
new file mode 100644
index 000000000..6f0e0ab04
--- /dev/null
+++ b/samples/Cellar/CellarServer/package.json
@@ -0,0 +1,6 @@
+{
+  "dependencies": {
+    "expres": "0.0.4",
+    "mongodb": "~1.2.10"
+  }
+}
diff --git a/samples/Cellar/CellarServer/packages.config b/samples/Cellar/CellarServer/packages.config
new file mode 100644
index 000000000..d606bd215
--- /dev/null
+++ b/samples/Cellar/CellarServer/packages.config
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="ScriptSharp" version="0.8" targetFramework="net40" />
+  <package id="ScriptSharp.Lib.Node" version="0.8" targetFramework="net40" />
+  <package id="ScriptSharp.Lib.Node.Express" version="0.8" targetFramework="net40" />
+  <package id="ScriptSharp.Lib.Node.Mongo" version="0.8" targetFramework="net40" />
+</packages>
\ No newline at end of file
diff --git a/samples/Cellar/packages/nuget.exe b/samples/Cellar/packages/nuget.exe
new file mode 100644
index 000000000..e313ff958
Binary files /dev/null and b/samples/Cellar/packages/nuget.exe differ
diff --git a/samples/Cellar/packages/nuget.targets b/samples/Cellar/packages/nuget.targets
new file mode 100644
index 000000000..51fc72bd2
--- /dev/null
+++ b/samples/Cellar/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/Cellar/packages/repositories.config b/samples/Cellar/packages/repositories.config
new file mode 100644
index 000000000..11de892d9
--- /dev/null
+++ b/samples/Cellar/packages/repositories.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<repositories>
+  <repository path="..\CellarClient\packages.config" />
+  <repository path="..\CellarServer\packages.config" />
+</repositories>
\ No newline at end of file
diff --git a/samples/FishTank/FishTank.csproj b/samples/FishTank/FishTank.csproj
index 30be88e4e..c8438ee23 100644
--- a/samples/FishTank/FishTank.csproj
+++ b/samples/FishTank/FishTank.csproj
@@ -15,7 +15,6 @@
     <GenerateResources>True</GenerateResources>
     <RestoreNugetPackages>True</RestoreNugetPackages>
     <MinimizeScript>True</MinimizeScript>
-    <CrunchScript>True</CrunchScript>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>bin\Debug\</OutputPath>
diff --git a/samples/FishTank/Properties/AssemblyInfo.cs b/samples/FishTank/Properties/AssemblyInfo.cs
index 28fe8f0db..01b2bcf79 100644
--- a/samples/FishTank/Properties/AssemblyInfo.cs
+++ b/samples/FishTank/Properties/AssemblyInfo.cs
@@ -24,7 +24,7 @@
 // {name}.js
 //
 
-'use script';
+'use strict';
 (function($global) {
   {script}
 })(this);
diff --git a/samples/KOWorld/App/App.csproj b/samples/KOWorld/App/App.csproj
index a260bd9bc..4045fe7a7 100644
--- a/samples/KOWorld/App/App.csproj
+++ b/samples/KOWorld/App/App.csproj
@@ -15,9 +15,7 @@
     <GenerateResources>True</GenerateResources>
     <UseDocumentation>False</UseDocumentation>
     <MinimizeScript>True</MinimizeScript>
-    <CrunchScript>True</CrunchScript>
     <CopyReferences>True</CopyReferences>
-    <DeploymentPath>..\Web\Scripts</DeploymentPath>
     <RestoreNugetPackages>true</RestoreNugetPackages>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/samples/KOWorld/Web/Web.csproj b/samples/KOWorld/Web/Web.csproj
index d2d70a8f4..7057513a3 100644
--- a/samples/KOWorld/Web/Web.csproj
+++ b/samples/KOWorld/Web/Web.csproj
@@ -63,7 +63,12 @@
     <Content Include="Scripts\ssloader.min.js" />
     <Content Include="Scripts\text.js" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <ProjectReference Include="..\App\App.csproj">
+      <Project>{6bfe535a-668c-447e-baf9-ac84b120f9bf}</Project>
+      <Name>App</Name>
+    </ProjectReference>
+  </ItemGroup>
   <ItemGroup>
     <Content Include="packages.config" />
   </ItemGroup>
@@ -93,6 +98,7 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
+  <Import Project="..\packages\ScriptSharp.Runtime.0.8\tools\ScriptSharpWeb.targets" Condition="Exists('..\packages\ScriptSharp.Runtime.0.8\tools\ScriptSharpWeb.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">
diff --git a/samples/Photos/Flickr/Flickr.csproj b/samples/Photos/Flickr/Flickr.csproj
index 6f5c066f1..58bbe45de 100644
--- a/samples/Photos/Flickr/Flickr.csproj
+++ b/samples/Photos/Flickr/Flickr.csproj
@@ -15,7 +15,6 @@
     <GenerateResources>True</GenerateResources>
     <RestoreNugetPackages>true</RestoreNugetPackages>
     <MinimizeScript>True</MinimizeScript>
-    <CrunchScript>True</CrunchScript>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>bin\Debug\</OutputPath>
diff --git a/samples/Photos/PhotoGrid/PhotoGrid.csproj b/samples/Photos/PhotoGrid/PhotoGrid.csproj
index f25d0c2be..10c5708ec 100644
--- a/samples/Photos/PhotoGrid/PhotoGrid.csproj
+++ b/samples/Photos/PhotoGrid/PhotoGrid.csproj
@@ -13,10 +13,8 @@
     <CodeAnalysisRuleSet>Properties\FxCop.ruleset</CodeAnalysisRuleSet>
     <GenerateScript>True</GenerateScript>
     <GenerateResources>True</GenerateResources>
-    <DeploymentPath>..\PhotosWeb\Scripts</DeploymentPath>
     <RestoreNugetPackages>true</RestoreNugetPackages>
     <MinimizeScript>True</MinimizeScript>
-    <CrunchScript>True</CrunchScript>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>bin\Debug\</OutputPath>
diff --git a/samples/Photos/PhotoGrid/Properties/AssemblyInfo.cs b/samples/Photos/PhotoGrid/Properties/AssemblyInfo.cs
index 11fdd5a6b..057bc7f3d 100644
--- a/samples/Photos/PhotoGrid/Properties/AssemblyInfo.cs
+++ b/samples/Photos/PhotoGrid/Properties/AssemblyInfo.cs
@@ -20,3 +20,19 @@
 [assembly: AssemblyFileVersion("1.0.0.0")]
 
 [assembly: ScriptAssembly("photoGrid")]
+
+// A script template using an AMD pattern for declaring dependencies consumed
+// by the generated script.
+[assembly: ScriptTemplate(@"
+/*! {name}.js {version}
+ * {description}
+ */
+
+""use strict"";
+
+require([{requires}], function({dependencies}) {
+  var $global = this;
+
+  {script}
+});
+")]
diff --git a/samples/Photos/PhotoList/PhotoList.csproj b/samples/Photos/PhotoList/PhotoList.csproj
index 849777562..e438a4f34 100644
--- a/samples/Photos/PhotoList/PhotoList.csproj
+++ b/samples/Photos/PhotoList/PhotoList.csproj
@@ -13,10 +13,8 @@
     <CodeAnalysisRuleSet>Properties\FxCop.ruleset</CodeAnalysisRuleSet>
     <GenerateScript>True</GenerateScript>
     <GenerateResources>True</GenerateResources>
-    <DeploymentPath>..\PhotosWeb\Scripts</DeploymentPath>
     <RestoreNugetPackages>true</RestoreNugetPackages>
     <MinimizeScript>True</MinimizeScript>
-    <CrunchScript>True</CrunchScript>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>bin\Debug\</OutputPath>
diff --git a/samples/Photos/PhotoList/Properties/AssemblyInfo.cs b/samples/Photos/PhotoList/Properties/AssemblyInfo.cs
index eb66b2f2b..1cb444620 100644
--- a/samples/Photos/PhotoList/Properties/AssemblyInfo.cs
+++ b/samples/Photos/PhotoList/Properties/AssemblyInfo.cs
@@ -20,3 +20,19 @@
 [assembly: AssemblyFileVersion("1.0.0.0")]
 
 [assembly: ScriptAssembly("photoList")]
+
+// A script template using an AMD pattern for declaring dependencies consumed
+// by the generated script.
+[assembly: ScriptTemplate(@"
+/*! {name}.js {version}
+ * {description}
+ */
+
+""use strict"";
+
+require([{requires}], function({dependencies}) {
+  var $global = this;
+
+  {script}
+});
+")]
diff --git a/samples/Photos/PhotoTiles/PhotoTiles.csproj b/samples/Photos/PhotoTiles/PhotoTiles.csproj
index 217cc859a..28f4f43d9 100644
--- a/samples/Photos/PhotoTiles/PhotoTiles.csproj
+++ b/samples/Photos/PhotoTiles/PhotoTiles.csproj
@@ -13,10 +13,8 @@
     <CodeAnalysisRuleSet>Properties\FxCop.ruleset</CodeAnalysisRuleSet>
     <GenerateScript>True</GenerateScript>
     <GenerateResources>True</GenerateResources>
-    <DeploymentPath>..\PhotosWeb\Scripts</DeploymentPath>
     <RestoreNugetPackages>true</RestoreNugetPackages>
     <MinimizeScript>True</MinimizeScript>
-    <CrunchScript>True</CrunchScript>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>bin\Debug\</OutputPath>
diff --git a/samples/Photos/PhotoTiles/Properties/AssemblyInfo.cs b/samples/Photos/PhotoTiles/Properties/AssemblyInfo.cs
index f24176619..16ea58a53 100644
--- a/samples/Photos/PhotoTiles/Properties/AssemblyInfo.cs
+++ b/samples/Photos/PhotoTiles/Properties/AssemblyInfo.cs
@@ -20,3 +20,19 @@
 [assembly: AssemblyFileVersion("1.0.0.0")]
 
 [assembly: ScriptAssembly("photoTiles")]
+
+// A script template using an AMD pattern for declaring dependencies consumed
+// by the generated script.
+[assembly: ScriptTemplate(@"
+/*! {name}.js {version}
+ * {description}
+ */
+
+""use strict"";
+
+require([{requires}], function({dependencies}) {
+  var $global = this;
+
+  {script}
+});
+")]
diff --git a/samples/Photos/PhotosWeb/PhotosWeb.csproj b/samples/Photos/PhotosWeb/PhotosWeb.csproj
index 10e9eeccb..b47b7041b 100644
--- a/samples/Photos/PhotosWeb/PhotosWeb.csproj
+++ b/samples/Photos/PhotosWeb/PhotosWeb.csproj
@@ -70,12 +70,28 @@
     <Content Include="Scripts\jquery.isotope.min.js" />
     <Content Include="Scripts\jquery.lightbox-0.5.js" />
     <Content Include="Scripts\jquery.tmpl.js" />
+    <Content Include="Scripts\ss.js" />
+    <Content Include="Scripts\ss.min.js" />
     <Content Include="Scripts\ssloader.js" />
     <Content Include="Scripts\ssloader.min.js" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PhotoGrid\PhotoGrid.csproj">
+      <Project>{2f542546-7b1d-4c43-af1f-092aee556fc2}</Project>
+      <Name>PhotoGrid</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\PhotoList\PhotoList.csproj">
+      <Project>{d4df1cc1-c044-4c90-ab09-9744e9acfcc9}</Project>
+      <Name>PhotoList</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\PhotoTiles\PhotoTiles.csproj">
+      <Project>{2f542547-7b1d-4c43-af1f-092aee556fc2}</Project>
+      <Name>PhotoTiles</Name>
+    </ProjectReference>
+  </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
@@ -102,6 +118,7 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
+  <Import Project="..\packages\ScriptSharp.Runtime.0.8\tools\ScriptSharpWeb.targets" Condition="Exists('..\packages\ScriptSharp.Runtime.0.8\tools\ScriptSharpWeb.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">
diff --git a/samples/Photos/Plugins/Gridster.cs b/samples/Photos/Plugins/Gridster.cs
index 99fb51864..99595ba66 100644
--- a/samples/Photos/Plugins/Gridster.cs
+++ b/samples/Photos/Plugins/Gridster.cs
@@ -26,27 +26,27 @@ public sealed class GridsterDraggable {
     public sealed class GridsterCoordinates {
 
         [ScriptName("col")]
-        [ScriptProperty]
+        [ScriptField]
         public int Column {
             get;
             set;
         }
 
-        [ScriptProperty]
+        [ScriptField]
         public int Row {
             get;
             set;
         }
 
         [ScriptName("size_x")]
-        [ScriptProperty]
+        [ScriptField]
         public int SizeX {
             get;
             set;
         }
 
         [ScriptName("size_y")]
-        [ScriptProperty]
+        [ScriptField]
         public int SizeY {
             get;
             set;
@@ -69,96 +69,96 @@ public GridsterOptions(params object[] nameValuePairs) {
         }
 
         [ScriptName("autogenerate_stylesheet")]
-        [ScriptProperty]
+        [ScriptField]
         public bool AutoGenerateStyleSheet {
             get;
             set;
         }
 
         [ScriptName("avoid_overlapped_widgets")]
-        [ScriptProperty]
+        [ScriptField]
         public bool AvoidOverlapping {
             get;
             set;
         }
 
         [ScriptName("widget_base_dimensions")]
-        [ScriptProperty]
+        [ScriptField]
         public int[] BaseDimensions {
             get;
             set;
         }
 
-        [ScriptProperty]
+        [ScriptField]
         public GridsterCollision Collision {
             get;
             set;
         }
 
-        [ScriptProperty]
+        [ScriptField]
         public GridsterDraggable Draggable {
             get;
             set;
         }
 
         [ScriptName("extra_cols")]
-        [ScriptProperty]
+        [ScriptField]
         public int ExtraColumns {
             get;
             set;
         }
 
         [ScriptName("extra_rows")]
-        [ScriptProperty]
+        [ScriptField]
         public int ExtraRows {
             get;
             set;
         }
 
         [ScriptName("widget_margins")]
-        [ScriptProperty]
+        [ScriptField]
         public int[] Margins {
             get;
             set;
         }
 
         [ScriptName("max_size_x")]
-        [ScriptProperty]
+        [ScriptField]
         public int MaximumColumnSpan {
             get;
             set;
         }
 
         [ScriptName("max_size_y")]
-        [ScriptProperty]
+        [ScriptField]
         public int MaximumRowSpan {
             get;
             set;
         }
 
         [ScriptName("min_cols")]
-        [ScriptProperty]
+        [ScriptField]
         public int MinimumColumns {
             get;
             set;
         }
 
         [ScriptName("min_rows")]
-        [ScriptProperty]
+        [ScriptField]
         public int MinimumRows {
             get;
             set;
         }
 
         [ScriptName("widget_selector")]
-        [ScriptProperty]
+        [ScriptField]
         public string Selector {
             get;
             set;
         }
 
         [ScriptName("serialize_params")]
-        [ScriptProperty]
+        [ScriptField]
         public GridsterSerializationCallback SerializationCallback {
             get;
             set;
diff --git a/samples/Todo/Todo/Todo.csproj b/samples/Todo/Todo/Todo.csproj
index 80e1dd6c0..a014d6493 100644
--- a/samples/Todo/Todo/Todo.csproj
+++ b/samples/Todo/Todo/Todo.csproj
@@ -15,8 +15,6 @@
     <GenerateScript>True</GenerateScript>
     <GenerateResources>True</GenerateResources>
     <MinimizeScript>True</MinimizeScript>
-    <CrunchScript>True</CrunchScript>
-    <DeploymentPath>..\TodoWeb\Scripts</DeploymentPath>
     <RestoreNugetPackages>true</RestoreNugetPackages>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/samples/Todo/TodoWeb/TodoWeb.csproj b/samples/Todo/TodoWeb/TodoWeb.csproj
index a81845aff..e36c176fc 100644
--- a/samples/Todo/TodoWeb/TodoWeb.csproj
+++ b/samples/Todo/TodoWeb/TodoWeb.csproj
@@ -4,8 +4,6 @@
   <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>
@@ -14,6 +12,7 @@
     <RootNamespace>TodoWeb</RootNamespace>
     <AssemblyName>TodoWeb</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <RestoreNugetPackages>true</RestoreNugetPackages>
     <UseIISExpress>true</UseIISExpress>
     <IISExpressSSLPort />
     <IISExpressAnonymousAuthentication />
@@ -59,6 +58,12 @@
   <ItemGroup>
     <Content Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Todo\Todo.csproj">
+      <Project>{27d4b0a9-e192-40a9-bfe2-034b9b93aa40}</Project>
+      <Name>Todo</Name>
+    </ProjectReference>
+  </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
@@ -84,6 +89,8 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
+  <Import Project="..\packages\nuget.targets" />
+  <Import Project="..\packages\ScriptSharp.Runtime.0.8\tools\ScriptSharpWeb.targets" Condition="Exists('..\packages\ScriptSharp.Runtime.0.8\tools\ScriptSharpWeb.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">
diff --git a/samples/WebREPL/App.cs b/samples/WebREPL/App.cs
new file mode 100644
index 000000000..3173bb5db
--- /dev/null
+++ b/samples/WebREPL/App.cs
@@ -0,0 +1,13 @@
+// App.cs
+//
+
+using System;
+using WebREPL;
+
+[ScriptModule]
+internal static class App {
+
+    static App() {
+        (new CommandHandler()).Run();
+    }
+}
diff --git a/samples/WebREPL/CommandHandler.cs b/samples/WebREPL/CommandHandler.cs
new file mode 100644
index 000000000..38e9d02cf
--- /dev/null
+++ b/samples/WebREPL/CommandHandler.cs
@@ -0,0 +1,57 @@
+// CommandHandler.cs
+//
+
+using System;
+using NodeApi;
+using NodeApi.Compute;
+using NodeApi.IO;
+
+namespace WebREPL {
+
+    internal sealed class CommandHandler {
+
+        private WebRequest _webRequest;
+        private WebResponse _webResponse;
+
+        public CommandHandler() {
+            _webRequest = new WebRequest();
+            _webResponse = new WebResponse();
+        }
+
+        private void EvaluateCommand(string command, object context, string fileName, AsyncResultCallback<object> callback) {
+            object result = Script.Undefined;
+
+            command = command.Substr(1, command.Length - 2).Trim();
+            if (command.Length != 0) {
+                WebCommand webCommand = WebCommand.TryParseCommand(command, _webRequest, _webResponse);
+                if (webCommand != null) {
+                    webCommand.HandleCommand(callback);
+                    return;
+                }
+                else {
+                    try {
+                        Script.SetField(context, "$", _webRequest);
+                        Script.SetField(context, "$$", _webResponse);
+
+                        ScriptInstance script = ScriptEngine.CreateScript(command);
+                        result = script.RunInNewContext(context);
+                    }
+                    catch (Exception e) {
+                        Console.Error(e.Message);
+                    }
+                }
+            }
+
+            callback(null, result);
+        }
+
+        public void Run() {
+            REPLOptions commandOptions = new REPLOptions();
+            commandOptions.Input = Node.Process.StandardInput;
+            commandOptions.Output = Node.Process.StandardOutput;
+            commandOptions.Eval = EvaluateCommand;
+
+            REPL.Start(commandOptions);
+        }
+    }
+}
diff --git a/samples/WebREPL/Properties/AssemblyInfo.cs b/samples/WebREPL/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..d6a24cd5f
--- /dev/null
+++ b/samples/WebREPL/Properties/AssemblyInfo.cs
@@ -0,0 +1,31 @@
+// AssemblyInfo.cs
+//
+
+using System;
+using System.Reflection;
+
+// 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("WebREPL")]
+[assembly: AssemblyDescription("WebREPL Sample for Script#")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("WebREPL")]
+[assembly: AssemblyCopyright("Copyright © 2013")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
+
+[assembly: ScriptAssembly("WebREPL")]
+
+// A script template allows customization of the generated script.
+[assembly: ScriptTemplate(@"
+// {name}.js {version}
+
+{dependenciesLookup}
+var $global = this;
+
+{script}
+")]
diff --git a/samples/WebREPL/Properties/FxCop.ruleset b/samples/WebREPL/Properties/FxCop.ruleset
new file mode 100644
index 000000000..47c160f61
--- /dev/null
+++ b/samples/WebREPL/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/WebREPL/WebCommand.cs b/samples/WebREPL/WebCommand.cs
new file mode 100644
index 000000000..1dd0339a0
--- /dev/null
+++ b/samples/WebREPL/WebCommand.cs
@@ -0,0 +1,206 @@
+// WebCommand.cs
+//
+
+using System;
+using System.Collections.Generic;
+using System.Serialization;
+using NodeApi;
+using NodeApi.IO;
+using NodeApi.Network;
+
+namespace WebREPL {
+
+    internal sealed class WebCommand {
+
+        private HttpVerb _verb;
+        private UrlData _urlData;
+
+        private WebRequest _webRequest;
+        private WebResponse _webResponse;
+
+        private AsyncResultCallback<object> _commandCallback;
+
+        private WebCommand(HttpVerb verb, UrlData urlData, WebRequest webRequest, WebResponse webResponse) {
+            _verb = verb;
+            _urlData = urlData;
+
+            _webRequest = webRequest;
+            _webResponse = webResponse;
+        }
+
+        private HttpClientOptions BuildHttpOptions() {
+            HttpClientOptions options = new HttpClientOptions();
+
+            options.HostName = _urlData.HostName;
+            if (String.IsNullOrEmpty(_urlData.Port) == false) {
+                options.Port = Int32.Parse(_urlData.Port);
+            }
+
+            Dictionary<string, string> query = new Dictionary<string, string>();
+            bool appendQuery = false;
+            if ((_webRequest.Query != null) || (_urlData.Query != null)) {
+                if (_webRequest.Query != null) {
+                    foreach (KeyValuePair<string, string> param in _webRequest.Query) {
+                        query[param.Key] = param.Value;
+                        appendQuery = true;
+                    }
+                }
+                if (_urlData.Query != null) {
+                    foreach (KeyValuePair<string, string> param in _urlData.Query) {
+                        query[param.Key] = param.Value;
+                        appendQuery = true;
+                    }
+                }
+            }
+
+            StringBuilder pathBuilder = new StringBuilder();
+            if (String.IsNullOrEmpty(_urlData.PathName) == false) {
+                pathBuilder.Append(_urlData.PathName);
+            }
+            else {
+                pathBuilder.Append("/");
+            }
+            if (appendQuery) {
+                pathBuilder.Append("?");
+
+                bool first = true;
+                foreach (KeyValuePair<string, string> param in query) {
+                    if (first == false) {
+                        pathBuilder.Append("&");
+                    }
+                    pathBuilder.Append(param.Key);
+                    pathBuilder.Append("=");
+                    pathBuilder.Append(param.Value.EncodeUriComponent());
+                }
+            }
+
+            options.Path = pathBuilder.ToString();
+
+            options.Headers = new Dictionary<string, string>();
+            options.Headers["Accept"] = "*/*";
+            if (_webRequest.Headers != null) {
+                foreach (KeyValuePair<string, string> header in _webRequest.Headers) {
+                    options.Headers[header.Key] = header.Value;
+                }
+            }
+            options.Headers["Host"] = _urlData.HostName;
+            if ((String.IsNullOrEmpty(_webRequest.UserName) == false) &&
+                (String.IsNullOrEmpty(_webRequest.Password) == false)) {
+                    string creds = _webRequest.UserName + ':' + _webRequest.Password;
+                    options.Headers["Authorization"] = "Basic " + new Buffer(creds).ToString(Encoding.Base64);
+            }
+
+            return options;
+        }
+
+        public void HandleCommand(AsyncResultCallback<object> callback) {
+            _commandCallback = callback;
+
+            HttpClientOptions options = BuildHttpOptions();
+            string requestData = null;
+
+            if ((_verb == HttpVerb.POST) || (_verb == HttpVerb.PUT)) {
+                if (_webRequest.Data != null) {
+                    string data;
+                    if (_webRequest.Data.GetType() == typeof(string)) {
+                        data = (string)_webRequest.Data;
+                        if (options.Headers.ContainsKey("Content-Type") == false) {
+                            options.Headers["Content-Type"] = "text/plain";
+                        }
+                    }
+                    else {
+                        data = Json.Stringify(_webRequest.Data);
+                        options.Headers["Content-Type"] = "application/json";
+                    }
+
+                    Buffer requestBuffer = new Buffer(data);
+                    requestData = requestBuffer.ToString(Encoding.UTF8);
+
+                    options.Headers["Content-Length"] = requestData.Length.ToString();
+                }
+            }
+
+            HttpClientRequest request;
+            if (_urlData.Protocol == "http:") {
+                request = Http.Request(options, HandleResponse);
+            }
+            else {
+                request = Https.Request(options, HandleResponse);
+            }
+
+            if (requestData != null) {
+                request.Write(requestData);
+            }
+
+            request.End();
+        }
+
+        private void HandleResponse(HttpClientResponse response) {
+            string responseData = String.Empty;
+
+            response.SetEncoding(Encoding.UTF8);
+            response.Data += delegate(string chunk) {
+                responseData += chunk;
+            };
+            response.End += delegate() {
+                _webResponse.StatusCode = response.StatusCode;
+                _webResponse.Headers = response.Headers;
+                _webResponse.ResponseText = responseData;
+
+                if (response.Headers["Content-Type"] == "application/json") {
+                    _webResponse.Response = Json.Parse(responseData);
+                }
+                else {
+                    _webResponse.Response = responseData;
+                }
+
+                _commandCallback(null, _webResponse.Response);
+            };
+        }
+
+        public static WebCommand TryParseCommand(string command, WebRequest webRequest, WebResponse webResponse) {
+            HttpVerb verb = HttpVerb.GET;
+            string uri  = null;
+
+            string altCommand = command.ToLowerCase();
+            if (altCommand.StartsWith("get ")) {
+                verb = HttpVerb.GET;
+                uri = command.Substring(4);
+            }
+            else if (altCommand.StartsWith("post ")) {
+                verb = HttpVerb.POST;
+                uri = command.Substring(5);
+            }
+            else if (altCommand.StartsWith("put ")) {
+                verb = HttpVerb.PUT;
+                uri = command.Substring(4);
+            }
+            else if (altCommand.StartsWith("delete ")) {
+                verb = HttpVerb.DELETE;
+                uri = command.Substring(7);
+            }
+            else if (altCommand.StartsWith("head ")) {
+                verb = HttpVerb.HEAD;
+                uri = command.Substring(5);
+            }
+            else if (altCommand.StartsWith("options ")) {
+                verb = HttpVerb.OPTIONS;
+                uri = command.Substring(8);
+            }
+
+            if (uri != null) {
+                uri = uri.Trim();
+
+                if (String.IsNullOrEmpty(uri) == false) {
+                    UrlData urlData = Url.Parse(uri, /* parseQueryString */ true);
+                    if ((urlData.Protocol == "http:") ||
+                        (urlData.Protocol == "https:")) {
+                        return new WebCommand(verb, urlData, webRequest, webResponse);
+                    }
+                }
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/samples/WebREPL/WebREPL.csproj b/samples/WebREPL/WebREPL.csproj
new file mode 100644
index 000000000..0650c5468
--- /dev/null
+++ b/samples/WebREPL/WebREPL.csproj
@@ -0,0 +1,55 @@
+<?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>{6066450B-79F0-453C-A91B-4C63B72DB220}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>WebREPL</RootNamespace>
+    <AssemblyName>WebREPL</AssemblyName>
+    <ScriptName>webrepl</ScriptName>
+    <CodeAnalysisRuleSet>Properties\FxCop.ruleset</CodeAnalysisRuleSet>
+    <GenerateScript>True</GenerateScript>
+    <GenerateResources>True</GenerateResources>
+    <MinimizeScript>False</MinimizeScript>
+    <CopyReferences>True</CopyReferences>
+    <CopyReferencesPath>node_modules</CopyReferencesPath>
+    <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>
+  </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>
+  </PropertyGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+    <None Include="Properties\FxCop.ruleset" />
+    <Compile Include="CommandHandler.cs" />
+    <Compile Include="WebResponse.cs" />
+    <Compile Include="WebRequest.cs" />
+    <Compile Include="WebCommand.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="App.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Script.Node, Version=0.8.0.0, Culture=neutral, PublicKeyToken=8fc0e3af5abcb6c4, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>packages\ScriptSharp.Lib.Node.0.8\lib\Script.Node.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="packages\nuget.targets" />
+  <Import Project="packages\ScriptSharp.0.8\tools\ScriptSharp.targets" Condition="Exists('packages\ScriptSharp.0.8\tools\ScriptSharp.targets')" />
+</Project>
\ No newline at end of file
diff --git a/samples/WebREPL/WebREPL.sln b/samples/WebREPL/WebREPL.sln
new file mode 100644
index 000000000..5196ab897
--- /dev/null
+++ b/samples/WebREPL/WebREPL.sln
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebREPL", "WebREPL.csproj", "{6066450B-79F0-453C-A91B-4C63B72DB220}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{6066450B-79F0-453C-A91B-4C63B72DB220}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6066450B-79F0-453C-A91B-4C63B72DB220}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6066450B-79F0-453C-A91B-4C63B72DB220}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6066450B-79F0-453C-A91B-4C63B72DB220}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/samples/WebREPL/WebRequest.cs b/samples/WebREPL/WebRequest.cs
new file mode 100644
index 000000000..02dceb274
--- /dev/null
+++ b/samples/WebREPL/WebRequest.cs
@@ -0,0 +1,26 @@
+// WebRequest.cs
+//
+
+using System;
+using System.Collections.Generic;
+
+namespace WebREPL {
+
+    [ScriptObject]
+    internal sealed class WebRequest {
+
+        public Dictionary<string, string> Query;
+        public Dictionary<string, string> Headers;
+        public object Data;
+        public string UserName;
+        public string Password;
+
+        public WebRequest() {
+            Query = new Dictionary<string, string>();
+            Headers = new Dictionary<string, string>();
+            Data = null;
+            UserName = null;
+            Password = null;
+        }
+    }
+}
diff --git a/samples/WebREPL/WebResponse.cs b/samples/WebREPL/WebResponse.cs
new file mode 100644
index 000000000..a436d2882
--- /dev/null
+++ b/samples/WebREPL/WebResponse.cs
@@ -0,0 +1,18 @@
+// WebResponse.cs
+//
+
+using System;
+using System.Collections.Generic;
+using NodeApi.Network;
+
+namespace WebREPL {
+
+    [ScriptObject]
+    internal sealed class WebResponse {
+
+        public Dictionary<string, string> Headers;
+        public HttpStatusCode StatusCode;
+        public string ResponseText;
+        public object Response;
+    }
+}
diff --git a/samples/WebREPL/packages.config b/samples/WebREPL/packages.config
new file mode 100644
index 000000000..58d401294
--- /dev/null
+++ b/samples/WebREPL/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="ScriptSharp" version="0.8" targetFramework="net40" />
+  <package id="ScriptSharp.Lib.Node" version="0.8" targetFramework="net40" />
+</packages>
\ No newline at end of file
diff --git a/samples/WebREPL/packages/nuget.exe b/samples/WebREPL/packages/nuget.exe
new file mode 100644
index 000000000..e313ff958
Binary files /dev/null and b/samples/WebREPL/packages/nuget.exe differ
diff --git a/samples/WebREPL/packages/nuget.targets b/samples/WebREPL/packages/nuget.targets
new file mode 100644
index 000000000..51fc72bd2
--- /dev/null
+++ b/samples/WebREPL/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/WebREPL/packages/repositories.config b/samples/WebREPL/packages/repositories.config
new file mode 100644
index 000000000..0dec135fc
--- /dev/null
+++ b/samples/WebREPL/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/src/Core/Build/Build.csproj b/src/Core/Build/Build.csproj
index 2ed2b40d2..2200432c5 100644
--- a/src/Core/Build/Build.csproj
+++ b/src/Core/Build/Build.csproj
@@ -74,6 +74,7 @@
   <ItemGroup>
     <Content Include="ScriptSharp.targets">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <SubType>Designer</SubType>
     </Content>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/src/Core/Build/ScriptSharp.targets b/src/Core/Build/ScriptSharp.targets
index b12125e61..dec726624 100644
--- a/src/Core/Build/ScriptSharp.targets
+++ b/src/Core/Build/ScriptSharp.targets
@@ -3,7 +3,7 @@
 ScriptSharp.targets
 Defines the steps in the standard build process specific for Script# projects.
 
-Copyright (C) 2012. Script# Project. All rights reserved.
+Copyright (c) 2013. Script# Project. All rights reserved.
 *******************************************************************************
 -->
 
@@ -12,6 +12,7 @@ Copyright (C) 2012. Script# Project. All rights reserved.
   <UsingTask TaskName="ResXCodeGeneratorTask" AssemblyFile="ScriptSharp.Build.dll" />
 
   <PropertyGroup>
+    <ScriptSharp>true</ScriptSharp>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>pdbonly</DebugType>
     <Optimize>false</Optimize>
@@ -31,19 +32,18 @@ Copyright (C) 2012. Script# Project. All rights reserved.
     <GeneratedResourceCode Include="$(IntermediateOutputPath)Resources.g.cs" />
   </ItemGroup>
 
-  <Target Name="BuildScript">
+  <Target Name="BuildScript" Returns="@(Scripts)">
     <ScriptCompilerTask
       Sources="@(Compile)"
       Resources="@(EmbeddedResource)"
       References="@(ReferencePath);@(ReferenceDependencyPaths)"
       Defines="$(DefineConstants)"
-      OutputPath="$(OutputPath)"
-      DeploymentPath="$(DeploymentPath)"
+      Minimize="$(MinimizeScript)"
       CopyReferences="$(CopyReferences)"
       CopyReferencesPath="$(CopyReferencesPath)"
-      CSharpAssembly="@(IntermediateAssembly)"
-      Minimize="$(MinimizeScript)"
-      Crunch="$(CrunchScript)"
+      OutputPath="$(OutputPath)"
+      Assembly="@(IntermediateAssembly)"
+      ScriptName="$(ScriptName)"
       ProjectPath="$(MSBuildProjectFullPath)">
       <Output TaskParameter="Scripts" ItemName="Scripts" />
     </ScriptCompilerTask>
diff --git a/src/Core/Build/Tasks/ScriptCompilerTask.cs b/src/Core/Build/Tasks/ScriptCompilerTask.cs
index e598bd776..ae7634a09 100644
--- a/src/Core/Build/Tasks/ScriptCompilerTask.cs
+++ b/src/Core/Build/Tasks/ScriptCompilerTask.cs
@@ -9,6 +9,7 @@
 using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using Microsoft.Build;
 using Microsoft.Build.Framework;
 using Microsoft.Build.Utilities;
@@ -28,62 +29,50 @@ public sealed class ScriptCompilerTask : Task, IErrorHandler, IStreamSourceResol
         private ITaskItem[] _references;
         private ITaskItem[] _sources;
         private ITaskItem[] _resources;
-        private ITaskItem _csharpAssembly;
+        private ITaskItem _assembly;
         private string _defines;
 
         private bool _minimize;
-        private bool _crunch;
         private bool _copyReferences;
-        private bool _localeSubfolders;
-        private string _referencesPath;
+        private string _copyReferencesPath;
         private string _outputPath;
-        private string _deploymentPath;
+        private string _scriptName;
         private List<ITaskItem> _scripts;
 
         private bool _hasErrors;
 
         public ScriptCompilerTask() {
             _copyReferences = true;
-            _crunch = true;
         }
 
-        public bool CopyReferences {
-            get {
-                return _copyReferences;
-            }
-            set {
-                _copyReferences = value;
-            }
-        }
-
-        public string CopyReferencesPath {
+        [Required]
+        public ITaskItem Assembly {
             get {
-                if (_referencesPath == null) {
-                    return String.Empty;
-                }
-                return _referencesPath;
+                return _assembly;
             }
             set {
-                _referencesPath = value;
+                _assembly = value;
             }
         }
 
-        public bool Crunch {
+        public bool CopyReferences {
             get {
-                return _crunch;
+                return _copyReferences;
             }
             set {
-                _crunch = value;
+                _copyReferences = value;
             }
         }
 
-        [Required]
-        public ITaskItem CSharpAssembly {
+        public string CopyReferencesPath {
             get {
-                return _csharpAssembly;
+                if (_copyReferencesPath == null) {
+                    return String.Empty;
+                }
+                return _copyReferencesPath;
             }
             set {
-                _csharpAssembly = value;
+                _copyReferencesPath = value;
             }
         }
 
@@ -99,27 +88,6 @@ public string Defines {
             }
         }
 
-        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 Minimize {
             get {
                 return _minimize;
@@ -142,6 +110,7 @@ public string OutputPath {
             }
         }
 
+        [Required]
         public string ProjectPath {
             get {
                 return _projectPath;
@@ -170,6 +139,15 @@ public ITaskItem[] Resources {
             }
         }
 
+        public string ScriptName {
+            get {
+                return _scriptName;
+            }
+            set {
+                _scriptName = value;
+            }
+        }
+
         [Output]
         public ITaskItem[] Scripts {
             get {
@@ -237,15 +215,12 @@ private bool Compile(IEnumerable<ITaskItem> sourceItems, IEnumerable<ITaskItem>
             if (_minimize) {
                 CompilerOptions minimizeOptions =
                     CreateOptions(sourceItems, resourceItems, locale,
-                                  /* includeTests */ false, /* minimize */ true,
-                                  out scriptTaskItem);
+                    /* includeTests */ false, /* minimize */ true,
+                                    out scriptTaskItem);
                 ScriptCompiler minimizingCompiler = new ScriptCompiler(this);
                 minimizingCompiler.Compile(minimizeOptions);
                 if (_hasErrors == false) {
-                    if (Crunch) {
-                        ExecuteCruncher(scriptTaskItem);
-                    }
-
+                    ExecuteCruncher(scriptTaskItem);
                     OnScriptFileGenerated(scriptTaskItem, minimizeOptions, /* copyReferences */ false);
                 }
                 else {
@@ -303,6 +278,7 @@ private bool ExecuteCore(IEnumerable<ITaskItem> sources, IEnumerable<ITaskItem>
                     }
                 }
 
+                GenerateDeploymentFile();
                 return true;
             }
 
@@ -327,6 +303,24 @@ private void ExecuteCruncher(ITaskItem scriptItem) {
             File.WriteAllText(scriptItem.ItemSpec, crunchedScript);
         }
 
+        private void GenerateDeploymentFile() {
+            try {
+                string assemblyFile = Path.GetFileName(_assembly.ItemSpec);
+                string scriptsFilePath = Path.Combine(OutputPath, Path.ChangeExtension(assemblyFile, "scripts"));
+
+                Uri scriptsUri = new Uri(Path.GetFullPath(scriptsFilePath), UriKind.Absolute);
+                IEnumerable<string> scripts =
+                    _scripts.Select(s => {
+                        Uri fileUri = new Uri(s.ItemSpec, UriKind.Absolute);
+                        return Uri.UnescapeDataString(scriptsUri.MakeRelativeUri(fileUri).ToString());
+                    });
+                File.WriteAllLines(scriptsFilePath, scripts);
+            }
+            catch (Exception e) {
+                Log.LogError(e.ToString());
+            }
+        }
+
         private ICollection<string> GetDefines() {
             if (Defines.Length == 0) {
                 return new string[0];
@@ -396,36 +390,21 @@ private ICollection<IStreamSource> GetResources(IEnumerable<ITaskItem> allResour
         }
 
         private string GetScriptFilePath(string locale, bool minimize, bool includeTests) {
-            if ((_csharpAssembly != null) && (OutputPath.Length != 0)) {
-                string assemblyPath = _csharpAssembly.ItemSpec;
-                string assemblyFile = Path.GetFileName(assemblyPath);
-                string outputPath = OutputPath;
-
-                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);
-                }
-
-                string extension = includeTests ? "test.js" : (minimize ? "min.js" : "js");
-                if (String.IsNullOrEmpty(locale) == false) {
-                    if (LocaleSubfolders) {
-                        outputPath = Path.Combine(outputPath, locale);
-                    }
-                    else {
-                        extension = locale + "." + extension;
-                    }
-                }
+            string scriptName = ScriptName;
+            if (String.IsNullOrEmpty(scriptName)) {
+                scriptName = Path.GetFileName(_assembly.ItemSpec);
+            }
 
-                if (Directory.Exists(outputPath) == false) {
-                    Directory.CreateDirectory(outputPath);
-                }
+            string extension = includeTests ? "test.js" : (minimize ? "min.js" : "js");
+            if (String.IsNullOrEmpty(locale) == false) {
+                extension = locale + "." + extension;
+            }
 
-                return Path.Combine(outputPath, Path.ChangeExtension(assemblyFile, extension));
+            if (Directory.Exists(OutputPath) == false) {
+                Directory.CreateDirectory(OutputPath);
             }
 
-            return null;
+            return Path.GetFullPath(Path.Combine(OutputPath, Path.ChangeExtension(scriptName, extension)));
         }
 
         private ICollection<IStreamSource> GetSources(IEnumerable<ITaskItem> sourceItems) {
@@ -450,8 +429,6 @@ private ICollection<IStreamSource> GetSources(IEnumerable<ITaskItem> sourceItems
         }
 
         private void OnScriptFileGenerated(ITaskItem scriptItem, CompilerOptions options, bool copyReferences) {
-            _scripts.Add(scriptItem);
-
             Func<string, bool, string> getScriptFile = delegate(string reference, bool minimized) {
                 string scriptFile = Path.ChangeExtension(reference, minimized ? ".min.js" : ".js");
 
@@ -496,6 +473,8 @@ private void OnScriptFileGenerated(ITaskItem scriptItem, CompilerOptions options
                     // 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);
+
+                    _scripts.Add(new TaskItem(targetFilePath));
                 }
                 catch (Exception e) {
                     Log.LogError("Unable to copy referenced script '" + sourceFilePath + "' as '" + targetFilePath + "' (" + e.Message + ")");
@@ -503,7 +482,7 @@ private void OnScriptFileGenerated(ITaskItem scriptItem, CompilerOptions options
                 }
             };
 
-            string projectName = (_projectPath != null) ? Path.GetFileNameWithoutExtension(_projectPath) : String.Empty;
+            string projectName = Path.GetFileNameWithoutExtension(_projectPath);
             string scriptFileName = Path.GetFileName(scriptItem.ItemSpec);
             string scriptPath = Path.GetFullPath(scriptItem.ItemSpec);
             string scriptFolder = Path.GetDirectoryName(scriptItem.ItemSpec);
@@ -518,39 +497,15 @@ private void OnScriptFileGenerated(ITaskItem scriptItem, CompilerOptions options
                         safeCopyFile(scriptFile, path);
                     }
 
-                    if (_minimize) {
-                        string minScriptFile = getScriptFile(reference, /* minimized */ true);
-                        if (minScriptFile != null) {
-                            string path = Path.Combine(scriptFolder, CopyReferencesPath, Path.GetFileName(minScriptFile));
-                            safeCopyFile(minScriptFile, path);
-                        }
+                    string minScriptFile = getScriptFile(reference, /* minimized */ true);
+                    if (minScriptFile != null) {
+                        string path = Path.Combine(scriptFolder, CopyReferencesPath, Path.GetFileName(minScriptFile));
+                        safeCopyFile(minScriptFile, 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 scriptFile = getScriptFile(reference, /* minimized */ false);
-                        if (scriptFile != null) {
-                            string path = Path.Combine(deploymentPath, CopyReferencesPath, Path.GetFileName(scriptFile));
-                            safeCopyFile(scriptFile, path);
-                        }
-
-                        if (_minimize) {
-                            string minScriptFile = getScriptFile(reference, /* minimized */ true);
-                            if (minScriptFile != null) {
-                                string path = Path.Combine(deploymentPath, CopyReferencesPath, Path.GetFileName(minScriptFile));
-                                safeCopyFile(minScriptFile, path);
-                            }
-                        }
-                    }
-                }
-            }
+            _scripts.Add(scriptItem);
         }
 
         #region Implementation of IErrorHandler
diff --git a/src/Core/Compiler/Compiler/ExpressionBuilder.cs b/src/Core/Compiler/Compiler/ExpressionBuilder.cs
index 9d1d38c46..7faed834a 100644
--- a/src/Core/Compiler/Compiler/ExpressionBuilder.cs
+++ b/src/Core/Compiler/Compiler/ExpressionBuilder.cs
@@ -7,6 +7,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Globalization;
 using System.Linq;
 using ScriptSharp;
 using ScriptSharp.CodeModel;
@@ -317,13 +318,27 @@ private Expression ProcessBinaryExpressionNode(BinaryExpressionNode node) {
 
             if (leftExpression.Type == ExpressionType.Member) {
                 leftExpression = TransformMemberExpression((MemberExpression)leftExpression,
-                    /* getOrAdd */ (node.Operator != TokenType.Equal));
+                                                           /* getOrAdd */ (node.Operator != TokenType.Equal));
             }
 
             if (rightExpression.Type == ExpressionType.Member) {
                 rightExpression = TransformMemberExpression((MemberExpression)rightExpression);
             }
 
+            if (node.Operator == TokenType.Coalesce) {
+                TypeSymbol scriptType = _symbolSet.ResolveIntrinsicType(IntrinsicType.Script);
+                MethodSymbol valueMethod = (MethodSymbol)scriptType.GetMember("Value");
+
+                TypeExpression scriptExpression = new TypeExpression(scriptType, SymbolFilter.Public | SymbolFilter.StaticMembers);
+                MethodExpression valueExpression = new MethodExpression(scriptExpression, valueMethod);
+
+                valueExpression.AddParameterValue(leftExpression);
+                valueExpression.AddParameterValue(rightExpression);
+                valueExpression.Reevaluate(rightExpression.EvaluatedType);
+
+                return valueExpression;
+            }
+
             TypeSymbol resultType = null;
             Operator operatorType = OperatorConverter.OperatorFromToken(node.Operator);
 
@@ -540,12 +555,7 @@ private Expression ProcessDotExpressionNode(BinaryExpressionNode node, SymbolFil
             }
 
             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();
-                }
+                objectExpression.AddParenthesisHint();
             }
 
             Debug.Assert(objectExpression.EvaluatedType is ISymbolTable);
@@ -1105,6 +1115,19 @@ private Expression ProcessOpenParenExpressionNode(BinaryExpressionNode node) {
                             return new InlineScriptExpression("", objectType);
                         }
 
+                        if (args.Count > 1) {
+                            // Check whether the script is a valid string format string
+                            try {
+                                object[] argValues = new object[args.Count - 1];
+                                String.Format(CultureInfo.InvariantCulture, script, argValues);
+                            }
+                            catch {
+                                _errorHandler.ReportError("The argument to Script.Literal must be a valid String.Format string.",
+                                                          argNodes.Expressions[0].Token.Location);
+                                return new InlineScriptExpression("", objectType);
+                            }
+                        }
+
                         InlineScriptExpression scriptExpression = new InlineScriptExpression(script, objectType);
                         for (int i = 1; i < args.Count; i++) {
                             scriptExpression.AddParameterValue(args[i]);
@@ -1115,9 +1138,22 @@ private Expression ProcessOpenParenExpressionNode(BinaryExpressionNode node) {
                     else if (method.Name.Equals("Boolean", StringComparison.Ordinal)) {
                         Debug.Assert(args.Count == 1);
 
+                        args[0].AddParenthesisHint();
                         return new UnaryExpression(Operator.LogicalNot, new UnaryExpression(Operator.LogicalNot, args[0]));
                     }
-                    else if (method.Name.Equals("Value", StringComparison.Ordinal)) {
+                    else if (method.Name.Equals("IsTruthy", StringComparison.Ordinal)) {
+                        Debug.Assert(args.Count == 1);
+
+                        args[0].AddParenthesisHint();
+                        return new UnaryExpression(Operator.LogicalNot, new UnaryExpression(Operator.LogicalNot, args[0]));
+                    }
+                    else if (method.Name.Equals("IsFalsey", StringComparison.Ordinal)) {
+                        Debug.Assert(args.Count == 1);
+
+                        args[0].AddParenthesisHint();
+                        return new UnaryExpression(Operator.LogicalNot, args[0]);
+                    }
+                    else if (method.Name.Equals("Or", StringComparison.Ordinal)) {
                         Debug.Assert(args.Count >= 2);
 
                         Expression expr = args[0];
diff --git a/src/Core/Compiler/Compiler/MetadataBuilder.cs b/src/Core/Compiler/Compiler/MetadataBuilder.cs
index 6a5c0456a..d846598f0 100644
--- a/src/Core/Compiler/Compiler/MetadataBuilder.cs
+++ b/src/Core/Compiler/Compiler/MetadataBuilder.cs
@@ -890,6 +890,10 @@ private void BuildType(TypeSymbol typeSymbol, UserTypeNode typeNode) {
                 if (moduleAttribute != null) {
                     ((ClassSymbol)typeSymbol).SetModuleClass();
                 }
+
+                if ((typeNode.Modifiers & Modifiers.Static) != 0) {
+                    ((ClassSymbol)typeSymbol).SetStaticClass();
+                }
             }
 
             if (typeNode.Type == TokenType.Enum) {
diff --git a/src/Core/Compiler/Generator/ExpressionGenerator.cs b/src/Core/Compiler/Generator/ExpressionGenerator.cs
index fe6e5ac3d..f05d70f36 100644
--- a/src/Core/Compiler/Generator/ExpressionGenerator.cs
+++ b/src/Core/Compiler/Generator/ExpressionGenerator.cs
@@ -43,11 +43,10 @@ private static void GenerateBinaryExpression(ScriptGenerator generator, MemberSy
                     Debug.Assert(propExpression.Type == ExpressionType.PropertySet);
 
                     if (propExpression.ObjectReference is BaseExpression) {
-                        writer.Write("ss.base(");
-                        writer.Write(generator.CurrentImplementation.ThisIdentifier);
-                        writer.Write(", 'set_");
+                        writer.Write(((BaseExpression)propExpression.ObjectReference).EvaluatedType.FullGeneratedName);
+                        writer.Write(".prototype.set_");
                         writer.Write(propExpression.Property.GeneratedName);
-                        writer.Write("').call(");
+                        writer.Write(".call(");
                         writer.Write(generator.CurrentImplementation.ThisIdentifier);
                         writer.Write(", ");
                         GenerateExpression(generator, symbol, expression.RightOperand);
@@ -71,11 +70,10 @@ private static void GenerateBinaryExpression(ScriptGenerator generator, MemberSy
                     Debug.Assert(indexExpression.Type == ExpressionType.Indexer);
 
                     if (indexExpression.ObjectReference is BaseExpression) {
-                        writer.Write("ss.base(");
-                        writer.Write(generator.CurrentImplementation.ThisIdentifier);
-                        writer.Write(", 'set_");
+                        writer.Write(((BaseExpression)indexExpression.ObjectReference).EvaluatedType.FullGeneratedName);
+                        writer.Write(".prototype.set_");
                         writer.Write(indexExpression.Indexer.GeneratedName);
-                        writer.Write("').call(");
+                        writer.Write(".call(");
                         writer.Write(generator.CurrentImplementation.ThisIdentifier);
                         writer.Write(", ");
                         GenerateExpressionList(generator, symbol, indexExpression.Indices);
@@ -478,11 +476,10 @@ private static void GenerateIndexerExpression(ScriptGenerator generator, MemberS
                 writer.Write("]");
             }
             else if (expression.ObjectReference is BaseExpression) {
-                writer.Write("ss.base(");
-                writer.Write(generator.CurrentImplementation.ThisIdentifier);
-                writer.Write(", 'get_");
+                writer.Write(((BaseExpression)expression.ObjectReference).EvaluatedType.FullGeneratedName);
+                writer.Write(".prototype.get_");
                 writer.Write(expression.Indexer.GeneratedName);
-                writer.Write("').call(");
+                writer.Write(".call(");
                 writer.Write(generator.CurrentImplementation.ThisIdentifier);
                 writer.Write(", ");
                 GenerateExpressionList(generator, symbol, expression.Indices);
@@ -525,7 +522,7 @@ private static void GenerateInlineScriptExpression(ScriptGenerator generator, Me
                     }
                 }
 
-                script = String.Format(script, parameterScripts);
+                script = String.Format(CultureInfo.InvariantCulture, script, parameterScripts);
             }
 
             writer.Write(script);
@@ -707,11 +704,10 @@ private static void GenerateMethodExpression(ScriptGenerator generator, MemberSy
             if (expression.ObjectReference is BaseExpression) {
                 Debug.Assert(expression.Method.IsExtension == false);
 
-                writer.Write("ss.base(");
-                writer.Write(generator.CurrentImplementation.ThisIdentifier);
-                writer.Write(", '");
+                writer.Write(((BaseExpression)expression.ObjectReference).EvaluatedType.FullGeneratedName);
+                writer.Write(".prototype.");
                 writer.Write(expression.Method.GeneratedName);
-                writer.Write("').call(");
+                writer.Write(".call(");
                 writer.Write(generator.CurrentImplementation.ThisIdentifier);
                 if ((expression.Parameters != null) && (expression.Parameters.Count != 0)) {
                     writer.Write(", ");
@@ -860,13 +856,7 @@ private static void GeneratePropertyExpression(ScriptGenerator generator, Member
                 Debug.Assert(baseClass != null);
 
                 writer.Write(baseClass.FullGeneratedName);
-                if (baseClass.IsApplicationType) {
-                    writer.Write("$.");
-                }
-                else {
-                    writer.Write(".prototype.");
-                }
-                writer.Write("get_");
+                writer.Write(".prototype.get_");
                 writer.Write(expression.Property.GeneratedName);
                 writer.Write(".call(");
                 writer.Write(generator.CurrentImplementation.ThisIdentifier);
diff --git a/src/Core/Compiler/Generator/MemberGenerator.cs b/src/Core/Compiler/Generator/MemberGenerator.cs
index 4f4bf8fb2..78eadaf2a 100644
--- a/src/Core/Compiler/Generator/MemberGenerator.cs
+++ b/src/Core/Compiler/Generator/MemberGenerator.cs
@@ -79,7 +79,7 @@ private static void GenerateEvent(ScriptGenerator generator, string typeName, Ev
             writer.Write("}");
 
             if (instanceMember == false) {
-                writer.WriteLine();
+                writer.WriteLine(";");
             }
 
             if (instanceMember) {
@@ -121,7 +121,7 @@ private static void GenerateEvent(ScriptGenerator generator, string typeName, Ev
             writer.Write("}");
 
             if (instanceMember == false) {
-                writer.WriteLine();
+                writer.WriteLine(";");
             }
         }
 
@@ -154,25 +154,13 @@ private static void GenerateIndexer(ScriptGenerator generator, string typeName,
                 return;
             }
 
-            ScriptTextWriter writer = generator.Writer;
+            Debug.Assert((indexerSymbol.Visibility & MemberVisibility.Static) == 0);
 
-            bool instanceMember = true;
-            if ((indexerSymbol.Visibility & MemberVisibility.Static) != 0) {
-                instanceMember = false;
-                writer.Write(typeName);
-                writer.Write(".");
-            }
+            ScriptTextWriter writer = generator.Writer;
 
             writer.Write("get_");
             writer.Write(indexerSymbol.GeneratedName);
-            if (instanceMember) {
-                writer.Write(": ");
-            }
-            else {
-                writer.Write(" = ");
-            }
-
-            writer.Write("function(");
+            writer.Write(": function(");
 
             for (int i = 0; i < indexerSymbol.Parameters.Count - 1; i++) {
                 ParameterSymbol parameterSymbol = indexerSymbol.Parameters[i];
@@ -193,28 +181,12 @@ private static void GenerateIndexer(ScriptGenerator generator, string typeName,
             writer.Indent--;
             writer.Write("}");
 
-            if (instanceMember == false) {
-                writer.WriteLine();
-            }
-
             if (indexerSymbol.IsReadOnly == false) {
-                if (instanceMember) {
-                    writer.WriteLine(",");
-                }
-                else {
-                    writer.Write(typeName);
-                    writer.Write(".");
-                }
+                writer.WriteLine(",");
 
                 writer.Write("set_");
                 writer.Write(indexerSymbol.GeneratedName);
-                if (instanceMember) {
-                    writer.Write(": ");
-                }
-                else {
-                    writer.Write(" = ");
-                }
-                writer.Write("function(");
+                writer.Write(": function(");
                 for (int i = 0; i < indexerSymbol.Parameters.Count; i++) {
                     ParameterSymbol parameterSymbol = indexerSymbol.Parameters[i];
                     if (i > 0) {
@@ -235,10 +207,6 @@ private static void GenerateIndexer(ScriptGenerator generator, string typeName,
                 writer.WriteLine(";");
                 writer.Indent--;
                 writer.Write("}");
-
-                if (instanceMember == false) {
-                    writer.WriteLine();
-                }
             }
         }
 
@@ -301,7 +269,7 @@ private static void GenerateMethod(ScriptGenerator generator, string typeName, M
             writer.Write("}");
 
             if (instanceMember == false) {
-                writer.WriteLine();
+                writer.WriteLine(";");
             }
         }
 
@@ -339,7 +307,7 @@ private static void GenerateProperty(ScriptGenerator generator, string typeName,
             writer.Write("}");
 
             if (instanceMember == false) {
-                writer.WriteLine();
+                writer.WriteLine(";");
             }
 
             if (propertySymbol.IsReadOnly == false) {
@@ -378,7 +346,7 @@ private static void GenerateProperty(ScriptGenerator generator, string typeName,
                 writer.Write("}");
 
                 if (instanceMember == false) {
-                    writer.WriteLine();
+                    writer.WriteLine(";");
                 }
             }
         }
diff --git a/src/Core/Compiler/Generator/ScriptGenerator.cs b/src/Core/Compiler/Generator/ScriptGenerator.cs
index a23f826cd..0841df52b 100644
--- a/src/Core/Compiler/Generator/ScriptGenerator.cs
+++ b/src/Core/Compiler/Generator/ScriptGenerator.cs
@@ -9,6 +9,7 @@
 using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using ScriptSharp;
 using ScriptSharp.ScriptModel;
 
@@ -106,9 +107,9 @@ public void GenerateScript(SymbolSet symbolSet) {
             // Sort the types, so similar types of types are grouped, and parent classes
             // come before derived classes.
             IComparer<TypeSymbol> typeComparer = new TypeComparer();
-            types.Sort(typeComparer);
-            publicTypes.Sort(typeComparer);
-            internalTypes.Sort(typeComparer);
+            types = types.OrderBy(t => t, typeComparer).ToList();
+            publicTypes = publicTypes.OrderBy(t => t, typeComparer).ToList();
+            internalTypes = internalTypes.OrderBy(t => t, typeComparer).ToList();
 
             bool initialIndent = false;
             if (String.IsNullOrEmpty(_options.ScriptInfo.Template) == false) {
diff --git a/src/Core/Compiler/Generator/TypeGenerator.cs b/src/Core/Compiler/Generator/TypeGenerator.cs
index 9bad6b18b..22ba64c38 100644
--- a/src/Core/Compiler/Generator/TypeGenerator.cs
+++ b/src/Core/Compiler/Generator/TypeGenerator.cs
@@ -69,44 +69,46 @@ private static void GenerateClass(ScriptGenerator generator, ClassSymbol classSy
                 }
             }
 
-            writer.Write("var ");
-            writer.Write(name);
-            writer.WriteLine("$ = {");
-            writer.Indent++;
+            if (classSymbol.IsStaticClass == false) {
+                writer.Write("var ");
+                writer.Write(name);
+                writer.WriteLine("$ = {");
+                writer.Indent++;
 
-            bool firstMember = true;
-            foreach (MemberSymbol memberSymbol in classSymbol.Members) {
-                if ((memberSymbol.Visibility & MemberVisibility.Static) == 0) {
-                    if (memberSymbol.Type == SymbolType.Field) {
-                        continue;
-                    }
+                bool firstMember = true;
+                foreach (MemberSymbol memberSymbol in classSymbol.Members) {
+                    if ((memberSymbol.Visibility & MemberVisibility.Static) == 0) {
+                        if (memberSymbol.Type == SymbolType.Field) {
+                            continue;
+                        }
 
-                    if ((memberSymbol is CodeMemberSymbol) &&
-                        ((CodeMemberSymbol)memberSymbol).IsAbstract) {
-                        continue;
+                        if ((memberSymbol is CodeMemberSymbol) &&
+                            ((CodeMemberSymbol)memberSymbol).IsAbstract) {
+                            continue;
+                        }
+
+                        if (firstMember == false) {
+                            writer.WriteLine(",");
+                        }
+
+                        MemberGenerator.GenerateScript(generator, memberSymbol);
+                        firstMember = false;
                     }
+                }
 
+                if (classSymbol.Indexer != null) {
                     if (firstMember == false) {
                         writer.WriteLine(",");
                     }
 
-                    MemberGenerator.GenerateScript(generator, memberSymbol);
-                    firstMember = false;
-                }
-            }
-
-            if (classSymbol.Indexer != null) {
-                if (firstMember == false) {
-                    writer.WriteLine(",");
+                    MemberGenerator.GenerateScript(generator, classSymbol.Indexer);
                 }
 
-                MemberGenerator.GenerateScript(generator, classSymbol.Indexer);
+                writer.Indent--;
+                writer.WriteLine();
+                writer.Write("};");
+                writer.WriteLine();
             }
-
-            writer.Indent--;
-            writer.WriteLine();
-            writer.Write("};");
-            writer.WriteLine();
         }
 
         private static void GenerateEnumeration(ScriptGenerator generator, EnumerationSymbol enumSymbol) {
@@ -260,8 +262,13 @@ public static void GenerateRegistrationScript(ScriptGenerator generator, TypeSym
                     writer.Write("[ ");
                     writer.Write(typeSymbol.FullGeneratedName);
                     writer.Write(", ");
-                    writer.Write(typeSymbol.FullGeneratedName);
-                    writer.Write("$, ");
+                    if (((ClassSymbol)typeSymbol).IsStaticClass == false) {
+                        writer.Write(typeSymbol.FullGeneratedName);
+                        writer.Write("$, ");
+                    }
+                    else {
+                        writer.Write("null, ");
+                    }
                     if ((classSymbol.BaseClass == null) || classSymbol.IsTestClass) {
                         // 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.
diff --git a/src/Core/Compiler/ScriptCompiler.cs b/src/Core/Compiler/ScriptCompiler.cs
index d6f25e48c..b2700fbb4 100644
--- a/src/Core/Compiler/ScriptCompiler.cs
+++ b/src/Core/Compiler/ScriptCompiler.cs
@@ -108,6 +108,10 @@ private void BuildMetadata() {
                     continue;
                 }
 
+                // TODO: We could allow conflicting types as long as both aren't public
+                //       since they won't be on the exported types list. Internal types that
+                //       conflict could be generated using full name.
+
                 string name = appType.GeneratedName;
                 if (types.ContainsKey(name)) {
                     string error = "The type '" + appType.FullName + "' conflicts with with '" + types[name].FullName + "' as they have the same name.";
@@ -310,11 +314,20 @@ private string GenerateScriptWithTemplate() {
                     depLookupBuilder.Append(",\r\n    ");
                 }
 
+                string name = dependency.Name;
+                if (name == "ss") {
+                    // TODO: This is a hack... to make generated node.js scripts
+                    //       be able to reference the 'scriptsharp' node module.
+                    //       Fix this in a better/1st class manner by allowing
+                    //       script assemblies to declare such things.
+                    name = "scriptsharp";
+                }
+
                 requiresBuilder.Append("'" + dependency.Path + "'");
                 dependenciesBuilder.Append(dependency.Identifier);
 
                 depLookupBuilder.Append(dependency.Identifier);
-                depLookupBuilder.Append(" = require('" + dependency.Name + "')");
+                depLookupBuilder.Append(" = require('" + name + "')");
 
                 firstDependency = false;
             }
diff --git a/src/Core/Compiler/ScriptModel/Expressions/LiteralExpression.cs b/src/Core/Compiler/ScriptModel/Expressions/LiteralExpression.cs
index 26baf48d7..0df7088b5 100644
--- a/src/Core/Compiler/ScriptModel/Expressions/LiteralExpression.cs
+++ b/src/Core/Compiler/ScriptModel/Expressions/LiteralExpression.cs
@@ -23,6 +23,9 @@ public LiteralExpression(TypeSymbol valueType, object value)
 
         protected override bool IsParenthesisRedundant {
             get {
+                // Numeric literals need to be paranthesized in script when followed by a
+                // dot member access, so it is not redundant for numbers.
+
                 if ((_value is String) || (_value is Boolean)) {
                     return true;
                 }
diff --git a/src/Core/Compiler/ScriptModel/Expressions/OperatorConverter.cs b/src/Core/Compiler/ScriptModel/Expressions/OperatorConverter.cs
index d6620bab4..ff9fdffe6 100644
--- a/src/Core/Compiler/ScriptModel/Expressions/OperatorConverter.cs
+++ b/src/Core/Compiler/ScriptModel/Expressions/OperatorConverter.cs
@@ -48,7 +48,6 @@ public static Operator OperatorFromToken(TokenType token) {
                 case TokenType.LogAnd:
                     return Operator.LogicalAnd;
                 case TokenType.LogOr:
-                case TokenType.Coalesce:
                     return Operator.LogicalOr;
                 case TokenType.EqualEqual:
                     return Operator.EqualEqualEqual;
diff --git a/src/Core/Compiler/ScriptModel/Symbols/ClassSymbol.cs b/src/Core/Compiler/ScriptModel/Symbols/ClassSymbol.cs
index 5db1ecd27..ad5d8392b 100644
--- a/src/Core/Compiler/ScriptModel/Symbols/ClassSymbol.cs
+++ b/src/Core/Compiler/ScriptModel/Symbols/ClassSymbol.cs
@@ -26,6 +26,7 @@ internal class ClassSymbol : TypeSymbol {
         private string _extendee;
         private bool _testClass;
         private bool _moduleClass;
+        private bool _staticClass;
 
         private ClassSymbol _primaryPartialClass;
 
@@ -124,6 +125,15 @@ public bool IsModuleClass {
             }
         }
 
+        public bool IsStaticClass {
+            get {
+                if (_primaryPartialClass != null) {
+                    return _primaryPartialClass.IsStaticClass;
+                }
+                return _staticClass;
+            }
+        }
+
         public bool IsTestClass {
             get {
                 if (_primaryPartialClass != null) {
@@ -303,6 +313,15 @@ public void SetPrimaryPartialClass(ClassSymbol primaryPartialClass) {
             _primaryPartialClass = primaryPartialClass;
         }
 
+        public void SetStaticClass() {
+            if (_primaryPartialClass != null) {
+                _primaryPartialClass.SetStaticClass();
+                return;
+            }
+
+            _staticClass = true;
+        }
+
         public void SetTestClass() {
             if (_primaryPartialClass != null) {
                 _primaryPartialClass.SetTestClass();
diff --git a/src/Core/Compiler/ScriptModel/Symbols/TypeSymbol.cs b/src/Core/Compiler/ScriptModel/Symbols/TypeSymbol.cs
index 1c956a876..5a42280cf 100644
--- a/src/Core/Compiler/ScriptModel/Symbols/TypeSymbol.cs
+++ b/src/Core/Compiler/ScriptModel/Symbols/TypeSymbol.cs
@@ -69,17 +69,13 @@ public override string DocumentationID {
 
         public string FullGeneratedName {
             get {
-                if (_ignoreNamespace == false) {
+                if ((IsApplicationType == false) && (_ignoreNamespace == false)) {
                     string namespaceName = GeneratedNamespace;
                     if (namespaceName.Length != 0) {
-                        if (IsApplicationType) {
-                            return namespaceName + "$" + GeneratedName;
-                        }
-                        else {
-                            return namespaceName + "." + GeneratedName;
-                        }
+                        return namespaceName + "." + GeneratedName;
                     }
                 }
+
                 return GeneratedName;
             }
         }
diff --git a/src/Core/CoreLib/Date.cs b/src/Core/CoreLib/Date.cs
index d1c03fd4a..f4e5b6cef 100644
--- a/src/Core/CoreLib/Date.cs
+++ b/src/Core/CoreLib/Date.cs
@@ -183,7 +183,7 @@ public int GetUTCSeconds() {
             return 0;
         }
 
-        [ScriptName("parseDate")]
+        [ScriptAlias("ss.date")]
         public static Date Parse(string value) {
             return null;
         }
diff --git a/src/Core/CoreLib/Runtime.cs b/src/Core/CoreLib/Runtime.cs
index 0293a8f29..63c298b1f 100644
--- a/src/Core/CoreLib/Runtime.cs
+++ b/src/Core/CoreLib/Runtime.cs
@@ -544,9 +544,66 @@ public decimal Value {
 
 namespace System.Runtime.InteropServices {
 
+    [AttributeUsageAttribute(AttributeTargets.Parameter, Inherited = false)]
     [EditorBrowsable(EditorBrowsableState.Never)]
     [ScriptIgnore]
-    public class OutAttribute {
+    public sealed class OutAttribute : Attribute {
+    }
+}
+
+namespace System.Runtime.Serialization {
+
+    [AttributeUsageAttribute(AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Enum, Inherited = false, AllowMultiple = false)]
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    [ScriptIgnore]
+    public sealed class DataContractAttribute : Attribute {
+
+        public bool IsReference {
+            get;
+            set;
+        }
+
+        public string Name {
+            get;
+            set;
+        }
+
+        public string Namespace {
+            get;
+            set;
+        }
+    }
+
+    [AttributeUsageAttribute(AttributeTargets.Property | AttributeTargets.Field, Inherited = false, AllowMultiple = false)]
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    [ScriptIgnore]
+    public sealed class DataMemberAttribute : Attribute {
+
+        public bool EmitDefaultValue {
+            get;
+            set;
+        }
+
+        public bool IsReference {
+            get;
+            set;
+        }
+
+        public string Name {
+            get;
+            set;
+        }
+
+        public int Order {
+            get;
+            set;
+        }
+    }
+
+    [AttributeUsageAttribute(AttributeTargets.Property | AttributeTargets.Field, Inherited = false, AllowMultiple = false)]
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    [ScriptIgnore]
+    public sealed class IgnoreDataMemberAttribute : Attribute {
     }
 }
 
diff --git a/src/Core/CoreLib/Script.cs b/src/Core/CoreLib/Script.cs
index 43f84b8bd..3e25f586a 100644
--- a/src/Core/CoreLib/Script.cs
+++ b/src/Core/CoreLib/Script.cs
@@ -131,6 +131,26 @@ public static T InvokeMethod<T>(Type type, string name, params object[] args) {
             return default(T);
         }
 
+        /// <summary>
+        /// Checks if the specified object has a falsey value, i.e. it is null or
+        /// undefined or empty string or false or zero.
+        /// </summary>
+        /// <param name="o">The object to test.</param>
+        /// <returns>true if the object represents a falsey value; false otherwise.</returns>
+        public static bool IsFalsey(object o) {
+            return false;
+        }
+
+        [ScriptAlias("isFinite")]
+        public static bool IsFinite(object o) {
+            return false;
+        }
+
+        [ScriptAlias("isNaN")]
+        public static bool IsNaN(object o) {
+            return false;
+        }
+
         /// <summary>
         /// Checks if the specified object is null.
         /// </summary>
@@ -176,6 +196,16 @@ public static bool IsValue(object o) {
             return false;
         }
 
+        /// <summary>
+        /// Checks if the specified object has a truthy value, i.e. it is not
+        /// null or undefined or empty string or false or zero.
+        /// </summary>
+        /// <param name="o">The object to test.</param>
+        /// <returns>true if the object represents a truthy value; false otherwise.</returns>
+        public static bool IsTruthy(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
@@ -188,6 +218,18 @@ public static object Literal(string script, params object[] args) {
             return null;
         }
 
+        /// <summary>
+        /// Gets the first truthy (true, non-null, non-undefined, non-empty, non-zero) 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 Or<TValue>(TValue value, TValue alternateValue, params TValue[] alternateValues) {
+            return default(TValue);
+        }
+
         public static void SetField(object instance, string name, object value) {
         }
 
@@ -245,13 +287,14 @@ public static int SetTimeout(Delegate d, int milliseconds, params object[] args)
         }
 
         /// <summary>
-        /// Gets the first valid (non-null, non-undefined, non-empty) value.
+        /// Gets the first non-null and non-undefined 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>
+        [ScriptAlias("ss.value")]
         public static TValue Value<TValue>(TValue value, TValue alternateValue, params TValue[] alternateValues) {
             return default(TValue);
         }
diff --git a/src/Core/CoreLib/String.cs b/src/Core/CoreLib/String.cs
index 6939d8088..e445f6acc 100644
--- a/src/Core/CoreLib/String.cs
+++ b/src/Core/CoreLib/String.cs
@@ -379,20 +379,36 @@ public string ToUpperCase() {
             return null;
         }
 
+        [ScriptAlias("ss.trim")]
         public string Trim() {
             return null;
         }
 
+        [ScriptAlias("ss.trim")]
+        public string Trim(char[] trimCharacters) {
+            return null;
+        }
+
         [ScriptAlias("ss.trimEnd")]
         public string TrimEnd() {
             return null;
         }
 
+        [ScriptAlias("ss.trimEnd")]
+        public string TrimEnd(char[] trimCharacters) {
+            return null;
+        }
+
         [ScriptAlias("ss.trimStart")]
         public string TrimStart() {
             return null;
         }
 
+        [ScriptAlias("ss.trimStart")]
+        public string TrimStart(char[] trimCharacters) {
+            return null;
+        }
+
         /// <summary>
         /// Decodes a string by replacing escaped parts with their equivalent textual representation.
         /// </summary>
diff --git a/src/Core/CoreLib/Threading/Task.cs b/src/Core/CoreLib/Threading/Task.cs
index 14e0080e7..2ab3bce7f 100644
--- a/src/Core/CoreLib/Threading/Task.cs
+++ b/src/Core/CoreLib/Threading/Task.cs
@@ -50,6 +50,10 @@ public static Task<Task> Any(int timeout, params Task[] tasks) {
             return null;
         }
 
+        public Task<TResult> ChangeWith<TResult>(Func<Task, TResult> continuation) {
+            return null;
+        }
+
         public Task ContinueWith(Action<Task> continuation) {
             return null;
         }
@@ -85,6 +89,10 @@ public T Result {
             }
         }
 
+        public Task<TResult> ChangeWith<TResult>(Func<Task<T>, TResult> continuation) {
+            return null;
+        }
+
         public Task<T> ContinueWith(Action<Task<T>> continuation) {
             return null;
         }
diff --git a/src/Core/Scripts/Loader.js b/src/Core/Scripts/Loader.js
index 2ca2f0886..324da6236 100644
--- a/src/Core/Scripts/Loader.js
+++ b/src/Core/Scripts/Loader.js
@@ -391,7 +391,7 @@
   if (document.addEventListener) {
     var rs = document.readyState;
     rs == 'complete' || rs == 'interactive' ?
-      _startup() :
+      setTimeout(_startup, 0) :
       document.addEventListener('DOMContentLoaded', _startup, false);
   }
   else if (global.attachEvent) {
diff --git a/src/Core/Scripts/Package/package.json b/src/Core/Scripts/Package/package.json
new file mode 100644
index 000000000..80826f7d6
--- /dev/null
+++ b/src/Core/Scripts/Package/package.json
@@ -0,0 +1,17 @@
+{
+  "name": "scriptsharp",
+  "version": "0.8.0",
+  "description": "Script# Runtime",
+  "keywords": [ "scriptsharp", "script#" ],
+  "author": "Nikhil Kothari",
+  "license": "Apache 2.0",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/nikhilk/scriptsharp"
+  },
+  "main": "ss.js",
+  "dependencies": {},
+  "engines": {
+    "node": "*"
+  }
+}
diff --git a/src/Core/Scripts/Package/readme.md b/src/Core/Scripts/Package/readme.md
new file mode 100644
index 000000000..b71dace71
--- /dev/null
+++ b/src/Core/Scripts/Package/readme.md
@@ -0,0 +1,4 @@
+Script# Runtime
+
+This packages the script# runtime as a node module for node.js applications written using c# and compiled into javascript using the script# compiler.
+More information is at [http://scriptsharp.com](http://scriptsharp.com).
diff --git a/src/Core/Scripts/Runtime.js b/src/Core/Scripts/Runtime.js
index b4cf92324..beba55767 100644
--- a/src/Core/Scripts/Runtime.js
+++ b/src/Core/Scripts/Runtime.js
@@ -44,6 +44,7 @@
       version: '0.8',
 
       isValue: isValue,
+      value: value,
       extend: extend,
       keys: keys,
       keyCount: keyCount,
@@ -55,6 +56,7 @@
       boolean: parseBoolean,
       regexp: parseRegExp,
       number: parseNumber,
+      date: parseDate,
       truncate: truncate,
       now: now,
       today: today,
@@ -69,6 +71,7 @@
       endsWith: endsWith,
       padLeft: padLeft,
       padRight: padRight,
+      trim: trim,
       trimStart: trimStart,
       trimEnd: trimEnd,
       insertString: insertString,
@@ -92,7 +95,6 @@
       safeCast: safeCast,
       canAssign: canAssign,
       instanceOf: instanceOf,
-      base: base,
 
       culture: {
         neutral: neutralCulture,
diff --git a/src/Core/Scripts/Runtime/Misc.js b/src/Core/Scripts/Runtime/Misc.js
index 481e0ca68..9275e4d8b 100644
--- a/src/Core/Scripts/Runtime/Misc.js
+++ b/src/Core/Scripts/Runtime/Misc.js
@@ -7,6 +7,18 @@ function isValue(o) {
   return (o !== null) && (o !== undefined);
 }
 
+function _value(args) {
+  for (var i = 2, l = args.length; i < l; i++) {
+    if (isValue(args[i])) {
+      return args[i];
+    }
+  }
+  return null;
+}
+function value(a, b) {
+  return isValue(a) ? a : isValue(b) ? b : _value(arguments);
+}
+
 function extend(o, items) {
   for (var n in items) {
     o[n] = items[n];
@@ -36,12 +48,17 @@ function parseNumber(s) {
     return 0;
   }
   if ((s.indexOf('.') >= 0) || (s.indexOf('e') >= 0) ||
-    s.endsWith('f') || s.endsWith('F')) {
+      endsWith(s, 'f') || endsWith(s, 'F')) {
     return parseFloat(s);
   }
   return parseInt(s, 10);
 }
 
+function parseDate(s) {
+  var t = Date.parse(s);
+  return isNaN(t) ? undefined : new Date(t);
+}
+
 function truncate(n) {
   return (n >= 0) ? Math.floor(n) : Math.ceil(n);
 }
@@ -107,7 +124,7 @@ function error(message, errorInfo, innerException) {
 
 function fail(message) {
   console.assert(false, message);
-  if (global.navigator && (global.navigator.userAgent.indexOf('MSIE') > 0)) {
+  if (global.navigator) {
     eval('debugger;');
   }
 }
diff --git a/src/Core/Scripts/Runtime/String.js b/src/Core/Scripts/Runtime/String.js
index ca3467230..6b864a922 100644
--- a/src/Core/Scripts/Runtime/String.js
+++ b/src/Core/Scripts/Runtime/String.js
@@ -58,11 +58,21 @@ function format(cultureOrFormat) {
     });
 }
 
-function trimStart(s) {
-  return s.replace(/^\s*/, '');
+function trim(s, tc) {
+  if (tc || !String.prototype.trim) {
+    tc = tc ? tc.join('') : null;
+    var r = tc ? new RegExp('^[' + tc + ']+|[' + tc + ']+$', 'g') : /^\s+|\s+$/g;
+    return s.replace(r, '');
+  }
+  return s.trim();
+}
+function trimStart(s, tc) {
+  var r = tc ? new RegExp('^[' + tc.join('') + ']+') : /^\s+/;
+  return s.replace(r, '');
 }
-function trimEnd(s) {
-  return s.replace(/\s*$/, '');
+function trimEnd(s, tc) {
+  var r = tc ? new RegExp('[' + tc.join('') + ']+$') : /\s+$/;
+  return s.replace(r, '');
 }
 function startsWith(s, prefix) {
   if (emptyString(prefix)) {
diff --git a/src/Core/Scripts/Runtime/Task.js b/src/Core/Scripts/Runtime/Task.js
index c308d00d6..40dd9f3b3 100644
--- a/src/Core/Scripts/Runtime/Task.js
+++ b/src/Core/Scripts/Runtime/Task.js
@@ -1,7 +1,7 @@
 // Task
 
 function Task(result) {
-  this._continuations = isValue(result) ?
+  this._continuations = result !== undefined ?
                           (this.status = 'done', null) :
                           (this.status = 'pending', []);
   this.result = result;
@@ -11,6 +11,23 @@ var Task$ = {
   get_completed: function() {
     return this.status != 'pending';
   },
+  changeWith: function(continuation) {
+    var task = new Task();
+    this.continueWith(function(t) {
+      var error = t.error;
+      var result;
+      if (!error) {
+        try {
+          result = continuation(t);
+        }
+        catch (e) {
+          error = e;
+        }
+      }
+      _updateTask(task, result, error);
+    });
+    return task;
+  },
   continueWith: function(continuation) {
     if (this._continuations) {
       this._continuations.push(continuation);
@@ -73,6 +90,10 @@ function _joinTasks(tasks, any) {
     tasks = tasks.slice(1);
     count--;
   }
+  if (Array.isArray(tasks[0])) {
+    tasks = tasks[0];
+    count = tasks.length;
+  }
 
   var joinTask = new Task();
   var seen = 0;
diff --git a/src/Core/Scripts/Runtime/TypeSystem.js b/src/Core/Scripts/Runtime/TypeSystem.js
index c478b92ff..5bf79bcfc 100644
--- a/src/Core/Scripts/Runtime/TypeSystem.js
+++ b/src/Core/Scripts/Runtime/TypeSystem.js
@@ -153,12 +153,6 @@ function safeCast(instance, type) {
   return instanceOf(type, instance) ? instance : null;
 }
 
-function base(instanceOrType, method) {
-  var baseType = instanceOrType.constructor.$base || instanceOrType.$base;
-  var m = baseType.prototype[method];
-  return m !== instanceOrType[method] ? m : base(baseType, method);
-}
-
 function module(name, implementation, exports) {
   var registry = _modules[name] = { $name: name };
 
diff --git a/src/Core/Scripts/Scripts.csproj b/src/Core/Scripts/Scripts.csproj
index e8894387f..a9323d886 100644
--- a/src/Core/Scripts/Scripts.csproj
+++ b/src/Core/Scripts/Scripts.csproj
@@ -32,11 +32,17 @@
     <Content Include="Runtime\Task.js" />
     <Content Include="Runtime\TypeSystem.js" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageContent Include="Package\package.json" />
+    <PackageContent Include="Package\readme.md" />
+  </ItemGroup>
   <Target Name="Build">
     <Exec Command="$(ToolsPath)\sspp.exe /nologo /debug /d:DEBUG /crlf /input:$(ProjectDir)Runtime.js /output:$(OutputPath)\ss.js" />
     <Exec Command="$(ToolsPath)\ajaxmin.exe -hc -clobber:true $(OutputPath)\ss.js -out $(OutputPath)\ss.min.js" />
     <Exec Command="$(ToolsPath)\sspp.exe /nologo /debug /d:DEBUG /crlf /input:$(ProjectDir)Loader.js /output:$(OutputPath)\ssloader.js" />
     <Exec Command="$(ToolsPath)\ajaxmin.exe -hc -clobber:true $(OutputPath)\ssloader.js -out $(OutputPath)\ssloader.min.js" />
+    <Copy SourceFiles="@(PackageContent)" DestinationFolder="$(OutputPath)\npm" />
+    <Copy SourceFiles="$(OutputPath)\ss.js" DestinationFolder="$(OutputPath)\npm" />
   </Target>
   <Target Name="Clean">
   </Target>
diff --git a/src/Libraries/Node/Node.Azure/Azure.cs b/src/Libraries/Node/Node.Azure/Azure.cs
new file mode 100644
index 000000000..7b6a58b4d
--- /dev/null
+++ b/src/Libraries/Node/Node.Azure/Azure.cs
@@ -0,0 +1,53 @@
+// Azure.cs
+// Script#/Libraries/Node/Azure
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+using NodeApi.WindowsAzure.Runtime;
+using NodeApi.WindowsAzure.Storage;
+
+namespace NodeApi.WindowsAzure {
+
+    /// <summary>
+    /// The root Azure services API.
+    /// </summary>
+    [ScriptImport]
+    [ScriptIgnoreNamespace]
+    [ScriptName("azure")]
+    public static class Azure {
+
+        [ScriptField]
+        [ScriptName(PreserveCase = true)]
+        public static RoleEnvironment RoleEnvironment {
+            get {
+                return null;
+            }
+        }
+
+        public static CloudBlobService CreateBlobService() {
+            return null;
+        }
+
+        public static CloudBlobService CreateBlobService(string storageAccount, string accessKey) {
+            return null;
+        }
+
+        public static CloudQueueService CreateQueueService() {
+            return null;
+        }
+
+        public static CloudQueueService CreateQueueService(string storageAccount, string accessKey) {
+            return null;
+        }
+
+        public static CloudTableService CreateTableService() {
+            return null;
+        }
+
+        public static CloudTableService CreateTableService(string storageAccount, string accessKey) {
+            return null;
+        }
+    }
+}
diff --git a/src/Libraries/Node/Node.Azure/Node.Azure.csproj b/src/Libraries/Node/Node.Azure/Node.Azure.csproj
new file mode 100644
index 000000000..a9296cadd
--- /dev/null
+++ b/src/Libraries/Node/Node.Azure/Node.Azure.csproj
@@ -0,0 +1,88 @@
+<?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>{4A9F7CE9-5B55-4B28-AD01-05528709B6E4}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>NodeApi.WindowsAzure</RootNamespace>
+    <AssemblyName>Script.Node.Azure</AssemblyName>
+    <NoStdLib>True</NoStdLib>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\..\..\ScriptSharp.snk</AssemblyOriginatorKeyFile>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>..\..\..\..\bin\Debug\</OutputPath>
+    <DebugSymbols>false</DebugSymbols>
+    <DefineConstants>DEBUG</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>..\..\..\..\bin\Debug\Script.Node.Azure.xml</DocumentationFile>
+    <NoWarn>1591, 0661, 0660, 1684</NoWarn>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>none</DebugType>
+    <DebugSymbols>false</DebugSymbols>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\..\..\bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>..\..\..\..\bin\Release\Script.Node.Azure.xml</DocumentationFile>
+    <NoWarn>1591, 0661, 0660, 1684</NoWarn>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="Azure.cs" />
+    <Compile Include="Runtime\RoleEventType.cs" />
+    <Compile Include="Runtime\RoleEvent.cs" />
+    <Compile Include="Runtime\RoleStatus.cs" />
+    <Compile Include="Runtime\Role.cs" />
+    <Compile Include="Runtime\RoleInstance.cs" />
+    <Compile Include="Runtime\RoleEnvironment.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="..\..\..\ScriptSharp.cs">
+      <Link>Properties\ScriptSharp.cs</Link>
+    </Compile>
+    <Compile Include="Storage\CloudQueueListContinuation.cs" />
+    <Compile Include="Storage\CloudTableListContinuation.cs" />
+    <Compile Include="Storage\CloudQueueMessage.cs" />
+    <Compile Include="Storage\CloudQueue.cs" />
+    <Compile Include="Storage\CloudTableQueryContinuation.cs" />
+    <Compile Include="Storage\CloudTable.cs" />
+    <Compile Include="Storage\CloudQueueService.cs" />
+    <Compile Include="Storage\CloudTableQuery.cs" />
+    <Compile Include="Storage\CloudTableEntity.cs" />
+    <Compile Include="Storage\CloudTableService.cs" />
+    <Compile Include="Storage\CloudBlobService.cs" />
+    <Compile Include="Storage\CloudBlobContainer.cs" />
+    <Compile Include="Storage\CloudBlobContainerListContinuation.cs" />
+    <Compile Include="Storage\CloudBlobListContinuation.cs" />
+    <Compile Include="Storage\CloudBlob.cs" />
+    <Compile Include="Storage\CloudBlockBlob.cs" />
+    <Compile Include="Storage\CloudBlobLease.cs" />
+    <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="..\Node.Core\Node.Core.csproj">
+      <Project>{4a9f7ce9-5a45-4b28-ad01-05528709b6e4}</Project>
+      <Name>Node.Core</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <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/Node/Node.Azure/Properties/AssemblyInfo.cs b/src/Libraries/Node/Node.Azure/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..653672513
--- /dev/null
+++ b/src/Libraries/Node/Node.Azure/Properties/AssemblyInfo.cs
@@ -0,0 +1,12 @@
+// AssemblyInfo.cs
+// Script#/Libraries/Node/Azure
+// 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.Node.Azure")]
+[assembly: AssemblyDescription("Script# NodeJS Azure Module API")]
+[assembly: ScriptAssembly("azure")]
diff --git a/src/Libraries/Node/Node.Azure/Properties/ScriptInfo.txt b/src/Libraries/Node/Node.Azure/Properties/ScriptInfo.txt
new file mode 100644
index 000000000..a0e3513f9
--- /dev/null
+++ b/src/Libraries/Node/Node.Azure/Properties/ScriptInfo.txt
@@ -0,0 +1,10 @@
+Node Azure Module
+===============================================================================
+
+This assembly provides access to Azure Cloud APIs for NodeJS applications.
+This is only meant for use at development time, so you can reference and compile
+your c# code against Azure APIs.
+
+More information is on http://www.windowsazure.com/en-us/develop/nodejs/.
+
+-------------------------------------------------------------------------------
diff --git a/src/Libraries/Node/Node.Azure/Runtime/Role.cs b/src/Libraries/Node/Node.Azure/Runtime/Role.cs
new file mode 100644
index 000000000..2841fc2c5
--- /dev/null
+++ b/src/Libraries/Node/Node.Azure/Runtime/Role.cs
@@ -0,0 +1,18 @@
+// Role.cs
+// Script#/Libraries/Node/Azure
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace NodeApi.WindowsAzure.Runtime {
+
+    [ScriptImport]
+    [ScriptIgnoreNamespace]
+    public sealed class Role {
+
+        private Role() {
+        }
+    }
+}
diff --git a/src/Libraries/Node/Node.Azure/Runtime/RoleEnvironment.cs b/src/Libraries/Node/Node.Azure/Runtime/RoleEnvironment.cs
new file mode 100644
index 000000000..87e1320c8
--- /dev/null
+++ b/src/Libraries/Node/Node.Azure/Runtime/RoleEnvironment.cs
@@ -0,0 +1,63 @@
+// RoleEnvironment.cs
+// Script#/Libraries/Node/Azure
+// 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 NodeApi.WindowsAzure.Runtime {
+
+    [ScriptImport]
+    [ScriptIgnoreNamespace]
+    public sealed class RoleEnvironment {
+
+        private RoleEnvironment() {
+        }
+
+        [ScriptEvent("on", "removeListener")]
+        public event Action<RoleEvent[]> Changed {
+            add {
+            }
+            remove {
+            }
+        }
+
+        [ScriptEvent("on", "removeListener")]
+        public event Action<RoleEvent[]> Changing {
+            add {
+            }
+            remove {
+            }
+        }
+
+        public void ClearStatus(AsyncCallback callback) {
+        }
+
+        public void GetConfigurationSettings(AsyncResultCallback<Dictionary<string, string>> callback) {
+        }
+
+        public void GetCurrentRoleInstance(AsyncResultCallback<RoleInstance> callback) {
+        }
+
+        [ScriptName("getDeploymentId")]
+        public void GetDeploymentID(AsyncResultCallback<string> callback) {
+        }
+
+        public void GetRoles(AsyncResultCallback<Role[]> callback) {
+        }
+
+        public void IsAvailable(AsyncResultCallback<bool> callback) {
+        }
+
+        public void IsEmulated(AsyncResultCallback<bool> callback) {
+        }
+
+        public void RequestRecycle(AsyncCallback callback) { 
+        }
+
+        public void SetStatus(RoleStatus status, Date expirationDate, AsyncCallback callback) {
+        }
+    }
+}
diff --git a/src/Libraries/Node/Node.Azure/Runtime/RoleEvent.cs b/src/Libraries/Node/Node.Azure/Runtime/RoleEvent.cs
new file mode 100644
index 000000000..ac2834823
--- /dev/null
+++ b/src/Libraries/Node/Node.Azure/Runtime/RoleEvent.cs
@@ -0,0 +1,32 @@
+// RoleEvent.cs
+// Script#/Libraries/Node/Azure
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace NodeApi.WindowsAzure.Runtime {
+
+    [ScriptImport]
+    [ScriptIgnoreNamespace]
+    public sealed class RoleEvent {
+
+        private RoleEvent() {
+        }
+
+        [ScriptField]
+        public string Name {
+            get {
+                return null;
+            }
+        }
+
+        [ScriptField]
+        public RoleEventType Type {
+            get {
+                return RoleEventType.ConfigurationSettingChange;
+            }
+        }
+    }
+}
diff --git a/src/Libraries/Node/Node.Azure/Runtime/RoleEventType.cs b/src/Libraries/Node/Node.Azure/Runtime/RoleEventType.cs
new file mode 100644
index 000000000..e7403960e
--- /dev/null
+++ b/src/Libraries/Node/Node.Azure/Runtime/RoleEventType.cs
@@ -0,0 +1,20 @@
+// RoleEventType.cs
+// Script#/Libraries/Node/Azure
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace NodeApi.WindowsAzure.Runtime {
+
+    [ScriptImport]
+    [ScriptIgnoreNamespace]
+    [ScriptConstants(UseNames = true)]
+    public enum RoleEventType {
+
+        TopologyChange = 0,
+
+        ConfigurationSettingChange = 1
+    }
+}
diff --git a/src/Libraries/Node/Node.Azure/Runtime/RoleInstance.cs b/src/Libraries/Node/Node.Azure/Runtime/RoleInstance.cs
new file mode 100644
index 000000000..272d094e9
--- /dev/null
+++ b/src/Libraries/Node/Node.Azure/Runtime/RoleInstance.cs
@@ -0,0 +1,18 @@
+// RoleInstance.cs
+// Script#/Libraries/Node/Azure
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace NodeApi.WindowsAzure.Runtime {
+
+    [ScriptImport]
+    [ScriptIgnoreNamespace]
+    public sealed class RoleInstance {
+
+        private RoleInstance() {
+        }
+    }
+}
diff --git a/src/Libraries/Node/Node.Azure/Runtime/RoleStatus.cs b/src/Libraries/Node/Node.Azure/Runtime/RoleStatus.cs
new file mode 100644
index 000000000..47f37368d
--- /dev/null
+++ b/src/Libraries/Node/Node.Azure/Runtime/RoleStatus.cs
@@ -0,0 +1,20 @@
+// RoleStatus.cs
+// Script#/Libraries/Node/Azure
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace NodeApi.WindowsAzure.Runtime {
+
+    [ScriptImport]
+    [ScriptIgnoreNamespace]
+    [ScriptConstants(UseNames = true)]
+    public enum RoleStatus {
+
+        Busy = 0,
+
+        Ready = 1
+    }
+}
diff --git a/src/Libraries/Node/Node.Azure/Storage/CloudBlob.cs b/src/Libraries/Node/Node.Azure/Storage/CloudBlob.cs
new file mode 100644
index 000000000..35caef469
--- /dev/null
+++ b/src/Libraries/Node/Node.Azure/Storage/CloudBlob.cs
@@ -0,0 +1,26 @@
+// CloudBlob.cs
+// Script#/Libraries/Node/Azure
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace NodeApi.WindowsAzure.Storage {
+
+    [ScriptImport]
+    [ScriptIgnoreNamespace]
+    public abstract class CloudBlob {
+
+        internal CloudBlob() {
+        }
+
+        [ScriptField]
+        [ScriptName("blob")]
+        public string Name {
+            get {
+                return null;
+            }
+        }
+    }
+}
diff --git a/src/Libraries/Node/Node.Azure/Storage/CloudBlobContainer.cs b/src/Libraries/Node/Node.Azure/Storage/CloudBlobContainer.cs
new file mode 100644
index 000000000..374a1cd31
--- /dev/null
+++ b/src/Libraries/Node/Node.Azure/Storage/CloudBlobContainer.cs
@@ -0,0 +1,25 @@
+// CloudBlobContainer.cs
+// Script#/Libraries/Node/Azure
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace NodeApi.WindowsAzure.Storage {
+
+    [ScriptImport]
+    [ScriptIgnoreNamespace]
+    public sealed class CloudBlobContainer {
+
+        private CloudBlobContainer() {
+        }
+
+        [ScriptField]
+        public string Name {
+            get {
+                return null;
+            }
+        }
+    }
+}
diff --git a/src/Libraries/Node/Node.Azure/Storage/CloudBlobContainerListContinuation.cs b/src/Libraries/Node/Node.Azure/Storage/CloudBlobContainerListContinuation.cs
new file mode 100644
index 000000000..3bec7f8c9
--- /dev/null
+++ b/src/Libraries/Node/Node.Azure/Storage/CloudBlobContainerListContinuation.cs
@@ -0,0 +1,33 @@
+// CloudBlobContainerListContinuation.cs
+// Script#/Libraries/Node/Azure
+// 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 NodeApi.WindowsAzure.Storage {
+
+    [ScriptImport]
+    [ScriptIgnoreNamespace]
+    public sealed class CloudBlobContainerListContinuation {
+
+        private CloudBlobContainerListContinuation() {
+        }
+
+        [ScriptField]
+        public string NextMarker {
+            get {
+                return null;
+            }
+        }
+
+        public void GetNextPage(AsyncResultCallback<List<CloudBlobContainer>, CloudBlobContainerListContinuation> callback) {
+        }
+
+        public bool HasNextPage() {
+            return false;
+        }
+    }
+}
diff --git a/src/Libraries/Node/Node.Azure/Storage/CloudBlobLease.cs b/src/Libraries/Node/Node.Azure/Storage/CloudBlobLease.cs
new file mode 100644
index 000000000..725507961
--- /dev/null
+++ b/src/Libraries/Node/Node.Azure/Storage/CloudBlobLease.cs
@@ -0,0 +1,25 @@
+// CloudBlobLease.cs
+// Script#/Libraries/Node/Azure
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace NodeApi.WindowsAzure.Storage {
+
+    [ScriptImport]
+    [ScriptIgnoreNamespace]
+    public abstract class CloudBlobLease {
+
+        internal CloudBlobLease() {
+        }
+
+        [ScriptField]
+        public string ID {
+            get {
+                return null;
+            }
+        }
+    }
+}
diff --git a/src/Libraries/Node/Node.Azure/Storage/CloudBlobListContinuation.cs b/src/Libraries/Node/Node.Azure/Storage/CloudBlobListContinuation.cs
new file mode 100644
index 000000000..31065d9db
--- /dev/null
+++ b/src/Libraries/Node/Node.Azure/Storage/CloudBlobListContinuation.cs
@@ -0,0 +1,33 @@
+// CloudBlobListContinuation.cs
+// Script#/Libraries/Node/Azure
+// 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 NodeApi.WindowsAzure.Storage {
+
+    [ScriptImport]
+    [ScriptIgnoreNamespace]
+    public sealed class CloudBlobListContinuation {
+
+        private CloudBlobListContinuation() {
+        }
+
+        [ScriptField]
+        public string NextMarker {
+            get {
+                return null;
+            }
+        }
+
+        public void GetNextPage(AsyncResultCallback<List<CloudBlob>, CloudBlobListContinuation> callback) {
+        }
+
+        public bool HasNextPage() {
+            return false;
+        }
+    }
+}
diff --git a/src/Libraries/Node/Node.Azure/Storage/CloudBlobService.cs b/src/Libraries/Node/Node.Azure/Storage/CloudBlobService.cs
new file mode 100644
index 000000000..04ad65b8b
--- /dev/null
+++ b/src/Libraries/Node/Node.Azure/Storage/CloudBlobService.cs
@@ -0,0 +1,145 @@
+// CloudBlobService.cs
+// Script#/Libraries/Node/Azure
+// 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;
+using NodeApi.IO;
+
+namespace NodeApi.WindowsAzure.Storage {
+
+    // TODO: ACLs
+    // TODO: Page blobs
+    // TODO: Shared access signatures
+    // TODO: Metadata/properties
+
+    [ScriptImport]
+    [ScriptIgnoreNamespace]
+    public sealed class CloudBlobService {
+
+        private CloudBlobService() {
+        }
+
+        public void AcquireLease(string containerName, string blobName, AsyncResultCallback<CloudBlobLease> callback) {
+        }
+
+        public void AcquireLease(string containerName, string blobName, object options, AsyncResultCallback<CloudBlobLease> callback) {
+        }
+
+        public void BreakLease(string containerName, string blobName, string leaseID, AsyncResultCallback<CloudBlobLease> callback) {
+        }
+
+        public void BreakLease(string containerName, string blobName, string leaseID, object options, AsyncResultCallback<CloudBlobLease> callback) {
+        }
+
+        public void CopyBlob(string sourceContainerName, string sourceBlobName, string targetContainerName, string targetBlobName, AsyncResultCallback<CloudBlob> callback) {
+        }
+
+        public void CopyBlob(string sourceContainerName, string sourceBlobName, string targetContainerName, string targetBlobName, object options, AsyncResultCallback<CloudBlob> callback) {
+        }
+
+        public void CreateBlobSnapshot(string containerName, string blobName, AsyncResultCallback<string> callback) {
+        }
+
+        public void CreateBlobSnapshot(string containerName, string blobName, object options, AsyncResultCallback<string> callback) {
+        }
+
+        public void CreateBlockBlobFromFile(string containerName, string blobName, string fileName, AsyncResultCallback<CloudBlockBlob> callback) {
+        }
+
+        public void CreateBlockBlobFromFile(string containerName, string blobName, string fileName, object options, AsyncResultCallback<CloudBlockBlob> callback) {
+        }
+
+        public void CreateBlockBlobFromStream(string containerName, string blobName, ReadableStream stream, AsyncResultCallback<CloudBlockBlob> callback) {
+        }
+
+        public void CreateBlockBlobFromStream(string containerName, string blobName, ReadableStream stream, object options, AsyncResultCallback<CloudBlockBlob> callback) {
+        }
+
+        public void CreateBlockBlobFromText(string containerName, string blobName, string text, AsyncResultCallback<CloudBlockBlob> callback) {
+        }
+
+        public void CreateBlockBlobFromText(string containerName, string blobName, string text, object options, AsyncResultCallback<CloudBlockBlob> callback) {
+        }
+
+        public void CreateContainer(string containerName, AsyncCallback callback) {
+        }
+
+        public void CreateContainer(string containerName, object options, AsyncCallback callback) {
+        }
+
+        public void CreateContainerIfNotExists(string containerName, AsyncCallback callback) {
+        }
+
+        public void CreateContainerIfNotExists(string containerName, object options, AsyncCallback callback) {
+        }
+
+        public void DeleteBlob(string containerName, string blobName, AsyncCallback callback) {
+        }
+
+        public void DeleteBlob(string containerName, string blobName, object options, AsyncCallback callback) {
+        }
+
+        public void DeleteContainer(string containerName, AsyncCallback callback) {
+        }
+
+        public void DeleteContainer(string containerName, object options, AsyncCallback callback) {
+        }
+
+        public void GetBlobToFile(string containerName, string blobName, string fileName, AsyncResultCallback<CloudBlockBlob> callback) {
+        }
+
+        public void GetBlobToFile(string containerName, string blobName, string fileName, object options, AsyncResultCallback<CloudBlockBlob> callback) {
+        }
+
+        public void GetBlobToStream(string containerName, string blobName, WritableStream stream, AsyncResultCallback<CloudBlockBlob> callback) {
+        }
+
+        public void GetBlobToStream(string containerName, string blobName, WritableStream stream, object options, AsyncResultCallback<CloudBlockBlob> callback) {
+        }
+
+        public void GetBlobToText(string containerName, string blobName, string text, AsyncResultCallback<string, CloudBlockBlob> callback) {
+        }
+
+        public void GetBlobToText(string containerName, string blobName, string text, object options, AsyncResultCallback<string, CloudBlockBlob> callback) {
+        }
+
+        public void ListBlobs(string containerName, AsyncResultCallback<List<CloudBlob>> callback) {
+        }
+
+        public void ListBlobs(string containerName, AsyncResultCallback<List<CloudBlob>, CloudBlobListContinuation> callback) {
+        }
+
+        public void ListBlobs(string containerName, object options, AsyncResultCallback<List<CloudBlob>> callback) {
+        }
+
+        public void ListBlobs(string containerName, object options, AsyncResultCallback<List<CloudBlob>, CloudBlobListContinuation> callback) {
+        }
+
+        public void ListContainers(AsyncResultCallback<List<CloudBlobContainer>> callback) {
+        }
+
+        public void ListContainers(AsyncResultCallback<List<CloudBlobContainer>, CloudBlobContainerListContinuation> callback) {
+        }
+
+        public void ListContainers(object options, AsyncResultCallback<List<CloudBlobContainer>> callback) {
+        }
+
+        public void ListContainers(object options, AsyncResultCallback<List<CloudBlobContainer>, CloudBlobContainerListContinuation> callback) {
+        }
+
+        public void ReleaseLease(string containerName, string blobName, string leaseID, AsyncResultCallback<CloudBlobLease> callback) {
+        }
+
+        public void ReleaseLease(string containerName, string blobName, string leaseID, object options, AsyncResultCallback<CloudBlobLease> callback) {
+        }
+
+        public void RenewLease(string containerName, string blobName, string leaseID, AsyncResultCallback<CloudBlobLease> callback) {
+        }
+
+        public void RenewLease(string containerName, string blobName, string leaseID, object options, AsyncResultCallback<CloudBlobLease> callback) {
+        }
+    }
+}
diff --git a/src/Libraries/Node/Node.Azure/Storage/CloudBlockBlob.cs b/src/Libraries/Node/Node.Azure/Storage/CloudBlockBlob.cs
new file mode 100644
index 000000000..b7457ae05
--- /dev/null
+++ b/src/Libraries/Node/Node.Azure/Storage/CloudBlockBlob.cs
@@ -0,0 +1,18 @@
+// CloudBlockBlob.cs
+// Script#/Libraries/Node/Azure
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace NodeApi.WindowsAzure.Storage {
+
+    [ScriptImport]
+    [ScriptIgnoreNamespace]
+    public sealed class CloudBlockBlob : CloudBlob {
+
+        private CloudBlockBlob() {
+        }
+    }
+}
diff --git a/src/Libraries/Node/Node.Azure/Storage/CloudQueue.cs b/src/Libraries/Node/Node.Azure/Storage/CloudQueue.cs
new file mode 100644
index 000000000..949eede12
--- /dev/null
+++ b/src/Libraries/Node/Node.Azure/Storage/CloudQueue.cs
@@ -0,0 +1,26 @@
+// CloudQueue.cs
+// Script#/Libraries/Node/Azure
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace NodeApi.WindowsAzure.Storage {
+
+    [ScriptImport]
+    [ScriptIgnoreNamespace]
+    public sealed class CloudQueue {
+
+        private CloudQueue() {
+        }
+
+        [ScriptField]
+        [ScriptName(PreserveCase = true)]
+        public string Name {
+            get {
+                return null;
+            }
+        }
+    }
+}
diff --git a/src/Libraries/Node/Node.Azure/Storage/CloudQueueListContinuation.cs b/src/Libraries/Node/Node.Azure/Storage/CloudQueueListContinuation.cs
new file mode 100644
index 000000000..2d32e5418
--- /dev/null
+++ b/src/Libraries/Node/Node.Azure/Storage/CloudQueueListContinuation.cs
@@ -0,0 +1,33 @@
+// CloudQueueListContinuation.cs
+// Script#/Libraries/Node/Azure
+// 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 NodeApi.WindowsAzure.Storage {
+
+    [ScriptImport]
+    [ScriptIgnoreNamespace]
+    public sealed class CloudQueueListContinuation {
+
+        private CloudQueueListContinuation() {
+        }
+
+        [ScriptField]
+        public string NextMarker {
+            get {
+                return null;
+            }
+        }
+
+        public void GetNextPage(AsyncResultCallback<List<CloudQueue>, CloudQueueListContinuation> callback) {
+        }
+
+        public bool HasNextPage() {
+            return false;
+        }
+    }
+}
diff --git a/src/Libraries/Node/Node.Azure/Storage/CloudQueueMessage.cs b/src/Libraries/Node/Node.Azure/Storage/CloudQueueMessage.cs
new file mode 100644
index 000000000..42d075201
--- /dev/null
+++ b/src/Libraries/Node/Node.Azure/Storage/CloudQueueMessage.cs
@@ -0,0 +1,42 @@
+// CloudQueueMessage.cs
+// Script#/Libraries/Node/Azure
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace NodeApi.WindowsAzure.Storage {
+
+    [ScriptImport]
+    [ScriptIgnoreNamespace]
+    public sealed class CloudQueueMessage {
+
+        private CloudQueueMessage() {
+        }
+
+        [ScriptField]
+        [ScriptName("messageid")]
+        public string MessageID {
+            get {
+                return null;
+            }
+        }
+
+        [ScriptField]
+        [ScriptName("messagetext")]
+        public string MessageText {
+            get {
+                return null;
+            }
+        }
+
+        [ScriptField]
+        [ScriptName("popreceipt")]
+        public string PopReceipt {
+            get {
+                return null;
+            }
+        }
+    }
+}
diff --git a/src/Libraries/Node/Node.Azure/Storage/CloudQueueService.cs b/src/Libraries/Node/Node.Azure/Storage/CloudQueueService.cs
new file mode 100644
index 000000000..f3826a8d3
--- /dev/null
+++ b/src/Libraries/Node/Node.Azure/Storage/CloudQueueService.cs
@@ -0,0 +1,82 @@
+// CloudQueueService.cs
+// Script#/Libraries/Node/Azure
+// 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 NodeApi.WindowsAzure.Storage {
+
+    // TODO: Properties, metadata related APIs
+    // TODO: Does azure sdk support shared access signature functionality for tables?
+
+    [ScriptImport]
+    [ScriptIgnoreNamespace]
+    public sealed class CloudQueueService {
+
+        private CloudQueueService() {
+        }
+
+        public void ClearMessages(string queueName, AsyncCallback callback) {
+        }
+
+        public void ClearMessages(string queueName, object options, AsyncCallback callback) {
+        }
+
+        public void CreateMessage(string queueName, string message, AsyncCallback callback) {
+        }
+
+        public void CreateMessage(string queueName, string message, object options, AsyncCallback callback) {
+        }
+
+        public void CreateQueue(string queueName, AsyncCallback callback) {
+        }
+
+        public void CreateQueue(string queueName, object options, AsyncCallback callback) {
+        }
+
+        public void CreateQueueIfNotExists(string queueName, AsyncCallback callback) {
+        }
+
+        public void CreateQueueIfNotExists(string queueName, object options, AsyncCallback callback) {
+        }
+
+        public void DeleteMessage(string queueName, string messageID, string popReceipt, AsyncCallback callback) {
+        }
+
+        public void DeleteMessage(string queueName, string messageID, string popReceipt, object options, AsyncCallback callback) {
+        }
+
+        public void DeleteQueue(string queueName, AsyncCallback callback) {
+        }
+
+        public void DeleteQueue(string queueName, object options, AsyncCallback callback) {
+        }
+
+        public void GetMessages(string queueName, AsyncResultCallback<List<CloudQueueMessage>> callback) {
+        }
+
+        public void GetMessages(string queueName, object options, AsyncResultCallback<List<CloudQueueMessage>> callback) {
+        }
+
+        public void ListQueues(AsyncResultCallback<List<CloudQueue>> callback) {
+        }
+
+        public void ListQueues(object options, AsyncResultCallback<List<CloudQueue>> callback) {
+        }
+
+        public void PeekMessages(string queueName, AsyncResultCallback<List<CloudQueueMessage>> callback) {
+        }
+
+        public void PeekMessages(string queueName, object options, AsyncResultCallback<List<CloudQueueMessage>> callback) {
+        }
+
+        public void UpdateMessage(string queueName, string messageID, string popReceipt, int visibilityTimeout, AsyncResultCallback<CloudQueueMessage> callback) {
+        }
+
+        public void UpdateMessage(string queueName, string messageID, string popReceipt, int visibilityTimeout, object options, AsyncResultCallback<CloudQueueMessage> callback) {
+        }
+    }
+}
diff --git a/src/Libraries/Node/Node.Azure/Storage/CloudTable.cs b/src/Libraries/Node/Node.Azure/Storage/CloudTable.cs
new file mode 100644
index 000000000..0c83c1f85
--- /dev/null
+++ b/src/Libraries/Node/Node.Azure/Storage/CloudTable.cs
@@ -0,0 +1,26 @@
+// CloudTable.cs
+// Script#/Libraries/Node/Azure
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace NodeApi.WindowsAzure.Storage {
+
+    [ScriptImport]
+    [ScriptIgnoreNamespace]
+    public sealed class CloudTable {
+
+        private CloudTable() {
+        }
+
+        [ScriptField]
+        [ScriptName(PreserveCase = true)]
+        public string TableName {
+            get {
+                return null;
+            }
+        }
+    }
+}
diff --git a/src/Libraries/Node/Node.Azure/Storage/CloudTableEntity.cs b/src/Libraries/Node/Node.Azure/Storage/CloudTableEntity.cs
new file mode 100644
index 000000000..536c61764
--- /dev/null
+++ b/src/Libraries/Node/Node.Azure/Storage/CloudTableEntity.cs
@@ -0,0 +1,60 @@
+// CloudTableEntity.cs
+// Script#/Libraries/Node/Azure
+// 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 NodeApi.WindowsAzure.Storage {
+
+    [ScriptImport]
+    [ScriptIgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class CloudTableEntity {
+
+        public CloudTableEntity() {
+        }
+
+        public CloudTableEntity(params object[] nameValuePairs) {
+        }
+
+        [ScriptField]
+        [ScriptName(PreserveCase = true)]
+        public string PartitionKey {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [ScriptField]
+        [ScriptName(PreserveCase = true)]
+        public string RowKey {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [ScriptField]
+        public object this[string key] {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        public static implicit operator Dictionary<string, object>(CloudTableEntity entity) {
+            return null;
+        }
+
+        public static implicit operator CloudTableEntity(Dictionary<string, object> data) {
+            return null;
+        }
+    }
+}
diff --git a/src/Libraries/Node/Node.Azure/Storage/CloudTableListContinuation.cs b/src/Libraries/Node/Node.Azure/Storage/CloudTableListContinuation.cs
new file mode 100644
index 000000000..10214c048
--- /dev/null
+++ b/src/Libraries/Node/Node.Azure/Storage/CloudTableListContinuation.cs
@@ -0,0 +1,33 @@
+// CloudTableListContinuation.cs
+// Script#/Libraries/Node/Azure
+// 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 NodeApi.WindowsAzure.Storage {
+
+    [ScriptImport]
+    [ScriptIgnoreNamespace]
+    public sealed class CloudTableListContinuation {
+
+        private CloudTableListContinuation() {
+        }
+
+        [ScriptField]
+        public string NextTableName {
+            get {
+                return null;
+            }
+        }
+
+        public void GetNextPage(AsyncResultCallback<List<CloudTable>, CloudTableListContinuation> callback) {
+        }
+
+        public bool HasNextPage() {
+            return false;
+        }
+    }
+}
diff --git a/src/Libraries/Node/Node.Azure/Storage/CloudTableQuery.cs b/src/Libraries/Node/Node.Azure/Storage/CloudTableQuery.cs
new file mode 100644
index 000000000..a54c06903
--- /dev/null
+++ b/src/Libraries/Node/Node.Azure/Storage/CloudTableQuery.cs
@@ -0,0 +1,57 @@
+// CloudTableQuery.cs
+// Script#/Libraries/Node/Azure
+// 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 NodeApi.WindowsAzure.Storage {
+
+    [ScriptImport]
+    [ScriptIgnoreNamespace]
+    [ScriptName("azure.TableQuery")]
+    public sealed class CloudTableQuery {
+
+        public CloudTableQuery And(string filter, object[] values) {
+            return null;
+        }
+
+        public CloudTableQuery From(string tableName) {
+            return null;
+        }
+
+        public CloudTableQuery Or(string filter, object[] values) {
+            return null;
+        }
+
+        public CloudTableQuery Select() {
+            return null;
+        }
+
+        public CloudTableQuery Select(string[] fields) {
+            return null;
+        }
+
+        public CloudTableQuery Top(int count) {
+            return null;
+        }
+
+        public CloudTableQuery Where(string filter, string value) {
+            return null;
+        }
+
+        public CloudTableQuery Where(string filter, object[] values) {
+            return null;
+        }
+
+        public CloudTableQuery WhereKeys(string partitionKey, string rowKey) {
+            return null;
+        }
+
+        public CloudTableQuery WhereNextKeys(string partitionKey, string rowKey) {
+            return null;
+        }
+    }
+}
diff --git a/src/Libraries/Node/Node.Azure/Storage/CloudTableQueryContinuation.cs b/src/Libraries/Node/Node.Azure/Storage/CloudTableQueryContinuation.cs
new file mode 100644
index 000000000..9c613bac3
--- /dev/null
+++ b/src/Libraries/Node/Node.Azure/Storage/CloudTableQueryContinuation.cs
@@ -0,0 +1,40 @@
+// CloudTableQueryContinuation.cs
+// Script#/Libraries/Node/Azure
+// 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 NodeApi.WindowsAzure.Storage {
+
+    [ScriptImport]
+    [ScriptIgnoreNamespace]
+    public sealed class CloudTableQueryContinuation {
+
+        private CloudTableQueryContinuation() {
+        }
+
+        [ScriptField]
+        public string NextPartitionKey {
+            get {
+                return null;
+            }
+        }
+
+        [ScriptField]
+        public string NextRowKey {
+            get {
+                return null;
+            }
+        }
+
+        public void GetNextPage(AsyncResultCallback<List<CloudTableEntity>, CloudTableQueryContinuation> callback) {
+        }
+
+        public bool HasNextPage() {
+            return false;
+        }
+    }
+}
diff --git a/src/Libraries/Node/Node.Azure/Storage/CloudTableService.cs b/src/Libraries/Node/Node.Azure/Storage/CloudTableService.cs
new file mode 100644
index 000000000..1360191c6
--- /dev/null
+++ b/src/Libraries/Node/Node.Azure/Storage/CloudTableService.cs
@@ -0,0 +1,130 @@
+// CloudTableService.cs
+// Script#/Libraries/Node/Azure
+// 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 NodeApi.WindowsAzure.Storage {
+
+    // TODO: Properties, metadata related APIs
+    // TODO: Does azure sdk support shared access signature functionality for tables?
+
+    [ScriptImport]
+    [ScriptIgnoreNamespace]
+    public sealed class CloudTableService {
+
+        private CloudTableService() {
+        }
+
+        public void BeginBatch() {
+        }
+
+        public void CommitBatch(AsyncCallback callback) {
+        }
+
+        public void CommitBatch(object options, AsyncCallback callback) {
+        }
+
+        public void CreateTable(string tableName, AsyncCallback callback) {
+        }
+
+        public void CreateTable(string tableName, object options, AsyncCallback callback) {
+        }
+
+        public void CreateTableIfNotExists(string tableName, AsyncResultCallback<bool> callback) {
+        }
+
+        public void CreateTableIfNotExists(string tableName, object options, AsyncResultCallback<bool> callback) {
+        }
+
+        public void DeleteEntity(string tableName, CloudTableEntity entity, AsyncResultCallback<bool> callback) {
+        }
+
+        public void DeleteEntity(string tableName, CloudTableEntity entity, object options, AsyncResultCallback<bool> callback) {
+        }
+
+        public void DeleteTable(string tableName, AsyncResultCallback<bool> callback) {
+        }
+
+        public void DeleteTable(string tableName, object options, AsyncResultCallback<bool> callback) {
+        }
+
+        public bool HasOperations() {
+            return false;
+        }
+
+        public void InsertEntity(string tableName, CloudTableEntity entity, AsyncResultCallback<CloudTableEntity> callback) {
+        }
+
+        public void InsertEntity(string tableName, CloudTableEntity entity, object options, AsyncResultCallback<CloudTableEntity> callback) {
+        }
+
+        public void InsertOrMergeEntity(string tableName, CloudTableEntity entity, AsyncResultCallback<CloudTableEntity> callback) {
+        }
+
+        public void InsertOrMergeEntity(string tableName, CloudTableEntity entity, object options, AsyncResultCallback<CloudTableEntity> callback) {
+        }
+
+        public void InsertOrReplaceEntity(string tableName, CloudTableEntity entity, AsyncResultCallback<CloudTableEntity> callback) {
+        }
+
+        public void InsertOrReplaceEntity(string tableName, CloudTableEntity entity, object options, AsyncResultCallback<CloudTableEntity> callback) {
+        }
+
+        public bool IsInBatch() {
+            return false;
+        }
+
+        [ScriptName("queryTables")]
+        public void ListTables(AsyncResultCallback<List<CloudTable>> callback) {
+        }
+
+        [ScriptName("queryTables")]
+        public void ListTables(AsyncResultCallback<List<CloudTable>, CloudTableListContinuation> callback) {
+        }
+
+        [ScriptName("queryTables")]
+        public void ListTables(object options, AsyncResultCallback<List<CloudTable>> callback) {
+        }
+
+        [ScriptName("queryTables")]
+        public void ListTables(object options, AsyncResultCallback<List<CloudTable>, CloudTableListContinuation> callback) {
+        }
+
+        public void MergeEntity(string tableName, CloudTableEntity entity, AsyncResultCallback<CloudTableEntity> callback) {
+        }
+
+        public void MergeEntity(string tableName, CloudTableEntity entity, object options, AsyncResultCallback<CloudTableEntity> callback) {
+        }
+
+        public void QueryEntities(CloudTableQuery query, AsyncResultCallback<List<CloudTableEntity>> callback) {
+        }
+
+        public void QueryEntities(CloudTableQuery query, object options, AsyncResultCallback<List<CloudTableEntity>> callback) {
+        }
+
+        public void QueryEntities(CloudTableQuery query, AsyncResultCallback<List<CloudTableEntity>, CloudTableQueryContinuation> callback) {
+        }
+
+        public void QueryEntities(CloudTableQuery query, object options, AsyncResultCallback<List<CloudTableEntity>, CloudTableQueryContinuation> callback) {
+        }
+
+        public void QueryEntity(string tableName, string partitionKey, string rowKey, AsyncResultCallback<CloudTableEntity> callback) {
+        }
+
+        public void QueryEntity(string tableName, string partitionKey, string rowKey, object options, AsyncResultCallback<CloudTableEntity> callback) {
+        }
+
+        public void Rollback() {
+        }
+
+        public void UpdateEntity(string tableName, CloudTableEntity entity, AsyncResultCallback<CloudTableEntity> callback) {
+        }
+
+        public void UpdateEntity(string tableName, CloudTableEntity entity, object options, AsyncResultCallback<CloudTableEntity> callback) {
+        }
+    }
+}
diff --git a/src/Libraries/Node/Node.Core/Compute/ChildProcess.cs b/src/Libraries/Node/Node.Core/Compute/ChildProcess.cs
index 6e966c33f..6d7d02672 100644
--- a/src/Libraries/Node/Node.Core/Compute/ChildProcess.cs
+++ b/src/Libraries/Node/Node.Core/Compute/ChildProcess.cs
@@ -5,6 +5,7 @@
 
 using System;
 using System.Runtime.CompilerServices;
+using NodeApi.IO;
 
 namespace NodeApi.Compute {
 
@@ -16,5 +17,77 @@ public sealed class ChildProcess : IEventEmitter {
 
         private ChildProcess() {
         }
+
+        [ScriptName("pid")]
+        [ScriptField]
+        public int ProcessID {
+            get {
+                return 0;
+            }
+        }
+
+        [ScriptName("stderr")]
+        [ScriptField]
+        public ReadableStream StandardError {
+            get {
+                return null;
+            }
+        }
+
+        [ScriptName("stdin")]
+        [ScriptField]
+        public WritableStream StandardInput {
+            get {
+                return null;
+            }
+        }
+
+        [ScriptName("stdout")]
+        [ScriptField]
+        public ReadableStream StandardOutput {
+            get {
+                return null;
+            }
+        }
+
+        public void Disconnect() {
+        }
+
+        public static ChildProcess Exec(string command, AsyncResultCallback<ReadableStream, ReadableStream> callback) {
+            return null;
+        }
+
+        public static ChildProcess Exec(string command, object options, AsyncResultCallback<ReadableStream, ReadableStream> callback) {
+            return null;
+        }
+
+        public static ChildProcess ExecFile(string command, string[] args, object options, AsyncResultCallback<ReadableStream, ReadableStream> callback) {
+            return null;
+        }
+
+        public void Kill() {
+        }
+
+        public void Kill(string signal) {
+        }
+
+        public static ChildProcess Fork(string command, string[] args, object options) {
+            return null;
+        }
+
+        public void Send(object message) {
+        }
+
+        public static ChildProcess Spawn(string command) {
+            return null;
+        }
+
+        public static ChildProcess Spawn(string command, string[] args) {
+            return null;
+        }
+
+        public static ChildProcess Spawn(string command, string[] args, object options) {
+            return null;
+        }
     }
 }
diff --git a/src/Libraries/Node/Node.Core/Compute/OS.cs b/src/Libraries/Node/Node.Core/Compute/OS.cs
index 7553bee99..7aaa40b57 100644
--- a/src/Libraries/Node/Node.Core/Compute/OS.cs
+++ b/src/Libraries/Node/Node.Core/Compute/OS.cs
@@ -13,5 +13,68 @@ namespace NodeApi.Compute {
     [ScriptDependency("os")]
     [ScriptName("os")]
     public static class OS {
+
+        [ScriptName("EOL")]
+        public static int EndOfLine = 0;
+
+        [ScriptName("arch")]
+        public static string GetArchitecture() {
+            return null;
+        }
+
+        [ScriptName("loadavg")]
+        public static int[] GetAverageLoad() {
+            return null;
+        }
+
+        [ScriptName("cpus")]
+        public static object[] GetCPUs() {
+            return null;
+        }
+
+        [ScriptName("freemem")]
+        public static int GetFreeMemory() {
+            return 0;
+        }
+
+        [ScriptName("hostname")]
+        public static string GetHostName() {
+            return null;
+        }
+
+        [ScriptName("type")]
+        public static string GetName() {
+            return null;
+        }
+
+        [ScriptName("networkInterfaces")]
+        public static object[] GetNetworkInterfaces() {
+            return null;
+        }
+
+        [ScriptName("platform")]
+        public static string GetPlatform() {
+            return null;
+        }
+
+        [ScriptName("release")]
+        public static string GetRelease() {
+            return null;
+        }
+
+        [ScriptName("tmpDir")]
+        public static string GetTempDirectory() {
+            return null;
+        }
+
+        [ScriptName("totalmem")]
+        public static int GetTotalMemory() {
+            return 0;
+        }
+
+        [ScriptName("uptime")]
+        public static int GetUptime() {
+            return 0;
+        }
     }
 }
diff --git a/src/Libraries/Node/Node.Core/Compute/Process.cs b/src/Libraries/Node/Node.Core/Compute/Process.cs
index 7f5112c53..c91b335a0 100644
--- a/src/Libraries/Node/Node.Core/Compute/Process.cs
+++ b/src/Libraries/Node/Node.Core/Compute/Process.cs
@@ -109,6 +109,14 @@ public event Action Exit {
             }
         }
 
+        [ScriptEvent("on", "removeListener")]
+        public event Action Message {
+            add {
+            }
+            remove {
+            }
+        }
+
         [ScriptEvent("on", "removeListener")]
         public event Action<Exception> UncaughtException {
             add {
@@ -124,6 +132,9 @@ public void ChangeDirectory(string directory) {
         public void Abort() {
         }
 
+        public void Disconnect() {
+        }
+
         [ScriptName("exit")]
         public void ExitProcess() {
         }
diff --git a/src/Libraries/Node/Node.Core/Compute/ScriptContext.cs b/src/Libraries/Node/Node.Core/Compute/ScriptContext.cs
new file mode 100644
index 000000000..df8c9d871
--- /dev/null
+++ b/src/Libraries/Node/Node.Core/Compute/ScriptContext.cs
@@ -0,0 +1,18 @@
+// ScriptContext.cs
+// Script#/Libraries/Node/Core
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace NodeApi.Compute {
+
+    [ScriptImport]
+    [ScriptIgnoreNamespace]
+    public sealed class ScriptContext {
+
+        private ScriptContext() {
+        }
+    }
+}
diff --git a/src/Libraries/Node/Node.Core/Compute/ScriptEngine.cs b/src/Libraries/Node/Node.Core/Compute/ScriptEngine.cs
new file mode 100644
index 000000000..d0fc344c6
--- /dev/null
+++ b/src/Libraries/Node/Node.Core/Compute/ScriptEngine.cs
@@ -0,0 +1,61 @@
+// ScriptEngine.cs
+// Script#/Libraries/Node/Core
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace NodeApi.Compute {
+
+    [ScriptImport]
+    [ScriptIgnoreNamespace]
+    [ScriptDependency("vm")]
+    [ScriptName("vm")]
+    public static class ScriptEngine {
+
+        public static ScriptContext CreateContext() {
+            return null;
+        }
+
+        public static ScriptContext CreateContext(object global) {
+            return null;
+        }
+
+        public static ScriptInstance CreateScript(string code) {
+            return null;
+        }
+
+        public static ScriptInstance CreateScript(string code, string fileName) {
+            return null;
+        }
+
+        public static object RunInContext(string code, ScriptContext context) {
+            return null;
+        }
+
+        public static object RunInContext(string code, ScriptContext context, string fileName) {
+            return null;
+        }
+
+        public static object RunInNewContext(string code) {
+            return null;
+        }
+
+        public static object RunInNewContext(string code, object global) {
+            return null;
+        }
+
+        public static object RunInNewContext(string code, object global, string fileName) {
+            return null;
+        }
+
+        public static object RunInThisContext(string code) {
+            return null;
+        }
+
+        public static object RunInThisContext(string code, string fileName) {
+            return null;
+        }
+    }
+}
diff --git a/src/Libraries/Node/Node.Core/Compute/ScriptInstance.cs b/src/Libraries/Node/Node.Core/Compute/ScriptInstance.cs
new file mode 100644
index 000000000..8a228105a
--- /dev/null
+++ b/src/Libraries/Node/Node.Core/Compute/ScriptInstance.cs
@@ -0,0 +1,30 @@
+// ScriptInstance.cs
+// Script#/Libraries/Node/Core
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace NodeApi.Compute {
+
+    [ScriptImport]
+    [ScriptIgnoreNamespace]
+    public sealed class ScriptInstance {
+
+        private ScriptInstance() {
+        }
+
+        public object RunInNewContext() {
+            return null;
+        }
+
+        public object RunInNewContext(object global) {
+            return null;
+        }
+
+        public object RunInThisContext() {
+            return null;
+        }
+    }
+}
diff --git a/src/Libraries/Node/Node.Core/IO/Buffer.cs b/src/Libraries/Node/Node.Core/IO/Buffer.cs
index b7109cb77..3b8c1de6a 100644
--- a/src/Libraries/Node/Node.Core/IO/Buffer.cs
+++ b/src/Libraries/Node/Node.Core/IO/Buffer.cs
@@ -11,5 +11,221 @@ namespace NodeApi.IO {
     [ScriptImport]
     [ScriptIgnoreNamespace]
     public sealed class Buffer {
+
+        public Buffer(int size) {
+        }
+
+        public Buffer(int[] data) {
+        }
+
+        public Buffer(string data) {
+        }
+
+        public Buffer(string data, Encoding encoding) {
+        }
+
+        [ScriptField]
+        public int Length {
+            get {
+                return 0;
+            }
+        }
+
+        public int this[int index] {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+
+        public static Buffer Concat(Buffer[] buffers) {
+            return null;
+        }
+
+        public static Buffer Concat(Buffer[] buffers, int count) {
+            return null;
+        }
+
+        public void Copy(Buffer targetBuffer) {
+        }
+
+        public void Copy(Buffer targetBuffer, int targetStart) {
+        }
+
+        public void Copy(Buffer targetBuffer, int targetStart, int sourceStart) {
+        }
+
+        public void Copy(Buffer targetBuffer, int targetStart, int sourceStart, int sourceLength) {
+        }
+
+        public void Fill(int i) {
+        }
+
+        public void Fill(int i, int offset) {
+        }
+
+        public void Fill(int i, int offset, int end) {
+        }
+
+        [ScriptName("byteLength")]
+        public static int GetByteLength(string s) {
+            return 0;
+        }
+
+        [ScriptName("byteLength")]
+        public static int GetByteLength(string s, Encoding encoding) {
+            return 0;
+        }
+
+        public static bool IsBuffer(object o) {
+            return false;
+        }
+
+        [ScriptName("readInt8")]
+        public byte ReadByte(int offset) {
+            return 0;
+        }
+
+        public double ReadDoubleBE(int offset) {
+            return 0;
+        }
+
+        public double ReadDoubleLE(int offset) {
+            return 0;
+        }
+
+        [ScriptName("readFloatBE")]
+        public float ReadSingleBE(int offset) {
+            return 0;
+        }
+
+        [ScriptName("readFloatLE")]
+        public float ReadSingleLE(int offset) {
+            return 0;
+        }
+
+        [ScriptName("readUInt8")]
+        public byte ReadUByte(int offset) {
+            return 0;
+        }
+
+        public short ReadInt16BE(int offset) {
+            return 0;
+        }
+
+        public short ReadInt16LE(int offset) {
+            return 0;
+        }
+
+        public int ReadInt32BE(int offset) {
+            return 0;
+        }
+
+        public int ReadInt32LE(int offset) {
+            return 0;
+        }
+
+        public short ReadUInt16BE(int offset) {
+            return 0;
+        }
+
+        public short ReadUInt16LE(int offset) {
+            return 0;
+        }
+
+        public int ReadUInt32BE(int offset) {
+            return 0;
+        }
+
+        public int ReadUInt32LE(int offset) {
+            return 0;
+        }
+
+        public Buffer Slice() {
+            return null;
+        }
+
+        public Buffer Slice(int start) {
+            return null;
+        }
+
+        public Buffer Slice(int start, int end) {
+            return null;
+        }
+
+        public string ToString(Encoding encoding) {
+            return null;
+        }
+
+        public string ToString(Encoding encoding, int start) {
+            return null;
+        }
+
+        public string ToString(Encoding encoding, int start, int end) {
+            return null;
+        }
+
+        public int Write(string s) {
+            return 0;
+        }
+
+        public int Write(string s, int offset) {
+            return 0;
+        }
+
+        public int Write(string s, int offset, int length) {
+            return 0;
+        }
+
+        public int Write(string s, int offset, int length, Encoding encoding) {
+            return 0;
+        }
+
+        [ScriptName("writeInt8")]
+        public void WriteByte(byte b, int offset) {
+        }
+
+        public void WriteDoubleBE(double value, int offset) {
+        }
+
+        public void WriteDoubleLE(double value, int offset) {
+        }
+
+        public void WriteInt16BE(short value, int offset) {
+        }
+
+        public void WriteInt16LE(short value, int offset) {
+        }
+
+        public void WriteInt32BE(int value, int offset) {
+        }
+
+        public void WriteInt32LE(int value, int offset) {
+        }
+
+        [ScriptName("writeFloatBE")]
+        public void WriteSingleBE(float value, int offset) {
+        }
+
+        [ScriptName("writeFloatLE")]
+        public void WriteSingleLE(float value, int offset) {
+        }
+
+        [ScriptName("writeUInt8")]
+        public void WriteUByte(byte b, int offset) {
+        }
+
+        public void WriteUInt16BE(short value, int offset) {
+        }
+
+        public void WriteUInt16LE(short value, int offset) {
+        }
+
+        public void WriteUInt32BE(int value, int offset) {
+        }
+
+        public void WriteUInt32LE(int value, int offset) {
+        }
     }
 }
diff --git a/src/Libraries/Node/Node.Core/IO/Console.cs b/src/Libraries/Node/Node.Core/IO/Console.cs
new file mode 100644
index 000000000..ba2737a25
--- /dev/null
+++ b/src/Libraries/Node/Node.Core/IO/Console.cs
@@ -0,0 +1,47 @@
+// Console.cs
+// Script#/Libraries/Node/Core
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace NodeApi.IO {
+
+    [ScriptImport]
+    [ScriptIgnoreNamespace]
+    [ScriptName("console")]
+    public static class Console {
+
+        public static void Error(string message) {
+        }
+
+        public static void Error(string messageFormat, params object[] args) {
+        }
+
+        public static void Log(string message) {
+        }
+
+        [ScriptName("dir")]
+        public static void Log(string messageFormat, params object[] args) {
+        }
+
+        [ScriptName("dir")]
+        public static void LogObject(object o) {
+        }
+
+        [ScriptName("timeEnd")]
+        public static void LogTimeEnd(string label) {
+        }
+
+        [ScriptName("time")]
+        public static void LogTimeStart(string label) {
+        }
+
+        public static void Warn(string message) {
+        }
+
+        public static void Warn(string messageFormat, params object[] args) {
+        }
+    }
+}
diff --git a/src/Libraries/Node/Node.Core/IO/Encoding.cs b/src/Libraries/Node/Node.Core/IO/Encoding.cs
index bd3752679..2a103af97 100644
--- a/src/Libraries/Node/Node.Core/IO/Encoding.cs
+++ b/src/Libraries/Node/Node.Core/IO/Encoding.cs
@@ -16,6 +16,9 @@ public enum Encoding {
         [ScriptName("ascii")]
         Ascii,
 
+        [ScriptName("base64")]
+        Base64,
+
         [ScriptName("hex")]
         Hex,
 
diff --git a/src/Libraries/Node/Node.Core/IO/FileSystem.cs b/src/Libraries/Node/Node.Core/IO/FileSystem.cs
index af2d4eeff..ec90c58a7 100644
--- a/src/Libraries/Node/Node.Core/IO/FileSystem.cs
+++ b/src/Libraries/Node/Node.Core/IO/FileSystem.cs
@@ -118,10 +118,6 @@ public static string[] ReadDirectorySync(string path) {
         public static void ReadFile(string fileName, AsyncResultCallback<Buffer> callback) {
         }
 
-        [ScriptName("readFile")]
-        public static void ReadFileText(string fileName, AsyncResultCallback<string> callback) {
-        }
-
         [ScriptName("readFile")]
         public static void ReadFileText(string fileName, Encoding encoding, AsyncResultCallback<string> callback) {
         }
@@ -130,12 +126,7 @@ public static Buffer ReadFileSync(string fileName) {
             return null;
         }
 
-        [ScriptName("readFile")]
-        public static string ReadFileTextSync(string fileName) {
-            return null;
-        }
-
-        [ScriptName("readFile")]
+        [ScriptName("readFileSync")]
         public static string ReadFileTextSync(string fileName, Encoding encoding) {
             return null;
         }
diff --git a/src/Libraries/Node/Node.Core/IO/LineReader.cs b/src/Libraries/Node/Node.Core/IO/LineReader.cs
new file mode 100644
index 000000000..afff778fb
--- /dev/null
+++ b/src/Libraries/Node/Node.Core/IO/LineReader.cs
@@ -0,0 +1,91 @@
+// LineReader.cs
+// Script#/Libraries/Node/Core
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace NodeApi.IO {
+
+    [ScriptImport]
+    [ScriptIgnoreNamespace]
+    [ScriptDependency("readline")]
+    public sealed class LineReader : IEventEmitter {
+
+        private LineReader() {
+        }
+
+        [ScriptEvent("on", "removeListener")]
+        public event Action Close {
+            add {
+            }
+            remove {
+            }
+        }
+
+        [ScriptEvent("on", "removeListener")]
+        [ScriptName("SIGINT")]
+        public event Action Interrupt {
+            add {
+            }
+            remove {
+            }
+        }
+
+        [ScriptEvent("on", "removeListener")]
+        public event Action<string> Line {
+            add {
+            }
+            remove {
+            }
+        }
+
+        [ScriptEvent("on", "removeListener")]
+        public event Action Pause {
+            add {
+            }
+            remove {
+            }
+        }
+
+        [ScriptEvent("on", "removeListener")]
+        public event Action Resume {
+            add {
+            }
+            remove {
+            }
+        }
+
+        public static LineReader CreateInterface(LineReaderOptions options) {
+            return null;
+        }
+
+        [ScriptName("close")]
+        public void CloseReader() {
+        }
+
+        [ScriptName("pause")]
+        public void PauseReader() {
+        }
+
+        public void Prompt() {
+        }
+
+        public void Prompt(bool preserveCursor) {
+        }
+
+        [ScriptName("resume")]
+        public void ResumeReader() {
+        }
+
+        public void Question(string query, Action<string> callback) {
+        }
+
+        public void SetPrompt(string prompt, int length) {
+        }
+
+        public void Write(string data) {
+        }
+    }
+}
diff --git a/src/Libraries/Node/Node.Core/IO/LineReaderOptions.cs b/src/Libraries/Node/Node.Core/IO/LineReaderOptions.cs
new file mode 100644
index 000000000..3cb578e0a
--- /dev/null
+++ b/src/Libraries/Node/Node.Core/IO/LineReaderOptions.cs
@@ -0,0 +1,40 @@
+// LineReaderOptions.cs
+// Script#/Libraries/Node/Core
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace NodeApi.IO {
+
+    [ScriptImport]
+    [ScriptIgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class LineReaderOptions {
+
+        public LineReaderOptions() {
+        }
+
+        public LineReaderOptions(params object[] nameValuePairs) {
+        }
+
+        [ScriptField]
+        public ReadableStream Input {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [ScriptField]
+        public WritableStream Output {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/Node/Node.Core/IO/Path.cs b/src/Libraries/Node/Node.Core/IO/Path.cs
new file mode 100644
index 000000000..725e7052b
--- /dev/null
+++ b/src/Libraries/Node/Node.Core/IO/Path.cs
@@ -0,0 +1,57 @@
+// Path.cs
+// Script#/Libraries/Node/Core
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace NodeApi.IO {
+
+    [ScriptImport]
+    [ScriptIgnoreNamespace]
+    [ScriptDependency("path")]
+    [ScriptName("path")]
+    public static class Path {
+
+        [ScriptName("sep")]
+        public static string PathSeparator = null;
+
+        [ScriptName("dirname")]
+        public static string GetDirectoryName(string path) {
+            return null;
+        }
+
+        [ScriptName("extname")]
+        public static string GetExtension(string path) {
+            return null;
+        }
+
+        [ScriptName("basename")]
+        public static string GetName(string path) {
+            return null;
+        }
+
+        [ScriptName("basename")]
+        public static string GetName(string path, string extensionToStrip) {
+            return null;
+        }
+
+        public static string Join(params string[] pathParts) {
+            return null;
+        }
+
+        [ScriptName("relative")]
+        public static string MakeRelative(string from, string to) {
+            return null;
+        }
+
+        public static string Normalize(string path) {
+            return null;
+        }
+
+        public static string Resolve(string from, string to) {
+            return null;
+        }
+    }
+}
diff --git a/src/Libraries/Node/Node.Core/IO/REPL.cs b/src/Libraries/Node/Node.Core/IO/REPL.cs
new file mode 100644
index 000000000..b46d7a79b
--- /dev/null
+++ b/src/Libraries/Node/Node.Core/IO/REPL.cs
@@ -0,0 +1,32 @@
+// REPL.cs
+// Script#/Libraries/Node/Core
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace NodeApi.IO {
+
+    [ScriptImport]
+    [ScriptIgnoreNamespace]
+    [ScriptDependency("repl")]
+    [ScriptName("repl")]
+    public sealed class REPL {
+
+        private REPL() {
+        }
+
+        [ScriptEvent("on", "removeListener")]
+        public event Action Exit {
+            add {
+            }
+            remove {
+            }
+        }
+
+        public static REPL Start(object options) {
+            return null;
+        }
+    }
+}
diff --git a/src/Libraries/Node/Node.Core/IO/REPLEvaluator.cs b/src/Libraries/Node/Node.Core/IO/REPLEvaluator.cs
new file mode 100644
index 000000000..a8ca7f0c5
--- /dev/null
+++ b/src/Libraries/Node/Node.Core/IO/REPLEvaluator.cs
@@ -0,0 +1,14 @@
+// REPLEvaluator.cs
+// Script#/Libraries/Node/Core
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace NodeApi.IO {
+
+    [ScriptImport]
+    [ScriptIgnoreNamespace]
+    public delegate void REPLEvaluator(string command, object context, string fileName, AsyncResultCallback<object> callback);
+}
diff --git a/src/Libraries/Node/Node.Core/IO/REPLOptions.cs b/src/Libraries/Node/Node.Core/IO/REPLOptions.cs
new file mode 100644
index 000000000..8724a572c
--- /dev/null
+++ b/src/Libraries/Node/Node.Core/IO/REPLOptions.cs
@@ -0,0 +1,58 @@
+// REPLOptions.cs
+// Script#/Libraries/Node/Core
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace NodeApi.IO {
+
+    [ScriptImport]
+    [ScriptIgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class REPLOptions {
+
+        public REPLOptions() {
+        }
+
+        public REPLOptions(params object[] nameValuePairs) {
+        }
+
+        [ScriptField]
+        public REPLEvaluator Eval {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [ScriptField]
+        public string Prompt {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [ScriptField]
+        public ReadableStream Input {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [ScriptField]
+        public WritableStream Output {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/Node/Node.Core/Network/HttpClientOptions.cs b/src/Libraries/Node/Node.Core/Network/HttpClientOptions.cs
index 831564ab3..d19d94068 100644
--- a/src/Libraries/Node/Node.Core/Network/HttpClientOptions.cs
+++ b/src/Libraries/Node/Node.Core/Network/HttpClientOptions.cs
@@ -4,6 +4,7 @@
 //
 
 using System;
+using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 
 namespace NodeApi.Network {
@@ -19,6 +20,60 @@ public HttpClientOptions() {
         public HttpClientOptions(object[] nameValuePairs) {
         }
 
-        // TODO
+        [ScriptField]
+        [ScriptName("auth")]
+        public string Credentials {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [ScriptField]
+        public Dictionary<string, string> Headers {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [ScriptField]
+        [ScriptName("hostname")]
+        public string HostName {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [ScriptField]
+        public HttpVerb Method {
+            get {
+                return HttpVerb.GET;
+            }
+            set {
+            }
+        }
+
+        [ScriptField]
+        public string Path {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [ScriptField]
+        public int Port {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
     }
 }
diff --git a/src/Libraries/Node/Node.Core/Network/HttpVerb.cs b/src/Libraries/Node/Node.Core/Network/HttpVerb.cs
index 01198d564..b7d9c3a44 100644
--- a/src/Libraries/Node/Node.Core/Network/HttpVerb.cs
+++ b/src/Libraries/Node/Node.Core/Network/HttpVerb.cs
@@ -23,6 +23,8 @@ public enum HttpVerb {
 
         HEAD,
 
-        OPTIONS
+        OPTIONS,
+
+        PATCH
     }
 }
diff --git a/src/Libraries/Node/Node.Core/Network/Url.cs b/src/Libraries/Node/Node.Core/Network/Url.cs
index 3d005d49b..42e005363 100644
--- a/src/Libraries/Node/Node.Core/Network/Url.cs
+++ b/src/Libraries/Node/Node.Core/Network/Url.cs
@@ -11,7 +11,7 @@ namespace NodeApi.Network {
     [ScriptImport]
     [ScriptIgnoreNamespace]
     [ScriptDependency("url")]
-    [ScriptName("URL")]
+    [ScriptName("url")]
     public static class Url {
 
         public static string Format(UrlData urlData) {
diff --git a/src/Libraries/Node/Node.Core/Network/UrlData.cs b/src/Libraries/Node/Node.Core/Network/UrlData.cs
index 19f856479..f2c03902e 100644
--- a/src/Libraries/Node/Node.Core/Network/UrlData.cs
+++ b/src/Libraries/Node/Node.Core/Network/UrlData.cs
@@ -39,6 +39,7 @@ public string Host {
         }
 
         [ScriptField]
+        [ScriptName("hostname")]
         public string HostName {
             get;
             set;
diff --git a/src/Libraries/Node/Node.Core/Node.Core.csproj b/src/Libraries/Node/Node.Core/Node.Core.csproj
index 96a845461..a564e9590 100644
--- a/src/Libraries/Node/Node.Core/Node.Core.csproj
+++ b/src/Libraries/Node/Node.Core/Node.Core.csproj
@@ -41,9 +41,19 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Compute\ChildProcess.cs" />
+    <Compile Include="Compute\ScriptInstance.cs" />
+    <Compile Include="Compute\ScriptContext.cs" />
+    <Compile Include="Compute\ScriptEngine.cs" />
     <Compile Include="Compute\OS.cs" />
     <Compile Include="AsyncCallback.cs" />
     <Compile Include="IO\Buffer.cs" />
+    <Compile Include="IO\Console.cs" />
+    <Compile Include="IO\REPLEvaluator.cs" />
+    <Compile Include="IO\REPLOptions.cs" />
+    <Compile Include="IO\REPL.cs" />
+    <Compile Include="IO\LineReaderOptions.cs" />
+    <Compile Include="IO\LineReader.cs" />
+    <Compile Include="IO\Path.cs" />
     <Compile Include="IO\FileSystemListener.cs" />
     <Compile Include="IO\FileAccess.cs" />
     <Compile Include="IO\WriteStreamOptions.cs" />
diff --git a/src/Libraries/Node/Node.Express/Express.cs b/src/Libraries/Node/Node.Express/Express.cs
index 4baea2251..720b95845 100644
--- a/src/Libraries/Node/Node.Express/Express.cs
+++ b/src/Libraries/Node/Node.Express/Express.cs
@@ -85,6 +85,10 @@ public static ExpressMiddleware Static(string path) {
             return null;
         }
 
+        public static ExpressMiddleware Static(string path, object options) {
+            return null;
+        }
+
         [ScriptName("urlencoded")]
         public static ExpressMiddleware UrlEncoded() {
             return null;
diff --git a/src/Libraries/Node/Node.Mongo/MongoConnector.cs b/src/Libraries/Node/Node.Mongo/MongoConnector.cs
new file mode 100644
index 000000000..18bd3ef23
--- /dev/null
+++ b/src/Libraries/Node/Node.Mongo/MongoConnector.cs
@@ -0,0 +1,24 @@
+// MongoConnector.cs
+// Script#/Libraries/Node/Mongo
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace NodeApi.MongoDB {
+
+    [ScriptImport]
+    [ScriptName("Db")]
+    public sealed class MongoConnector {
+
+        public MongoConnector(string name, MongoServer server) {
+        }
+
+        public MongoConnector(string name, MongoServer server, object options) {
+        }
+
+        public void Open(AsyncResultCallback<MongoDatabase> callback) {
+        }
+    }
+}
diff --git a/src/Libraries/Node/Node.Mongo/MongoDatabase.cs b/src/Libraries/Node/Node.Mongo/MongoDatabase.cs
index 83a52f053..7a4f0a74a 100644
--- a/src/Libraries/Node/Node.Mongo/MongoDatabase.cs
+++ b/src/Libraries/Node/Node.Mongo/MongoDatabase.cs
@@ -18,6 +18,9 @@ public MongoDatabase(string name, MongoServer server) {
         public MongoDatabase(string name, MongoServer server, object options) {
         }
 
+        public void Authenticate(string userName, string password, AsyncResultCallback<bool> successCallback) {
+        }
+
         public void Close() {
         }
 
diff --git a/src/Libraries/Node/Node.Mongo/Node.Mongo.csproj b/src/Libraries/Node/Node.Mongo/Node.Mongo.csproj
index 2fbd6c480..3cb4428b9 100644
--- a/src/Libraries/Node/Node.Mongo/Node.Mongo.csproj
+++ b/src/Libraries/Node/Node.Mongo/Node.Mongo.csproj
@@ -40,6 +40,7 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="MongoConnector.cs" />
     <Compile Include="MongoCursor.cs" />
     <Compile Include="MongoCollection.cs" />
     <Compile Include="MongoDatabase.cs" />
diff --git a/src/Libraries/Node/Node.Neo4j/GraphDatabase.cs b/src/Libraries/Node/Node.Neo4j/GraphDatabase.cs
new file mode 100644
index 000000000..291d43934
--- /dev/null
+++ b/src/Libraries/Node/Node.Neo4j/GraphDatabase.cs
@@ -0,0 +1,186 @@
+// GraphDatabase.cs
+// Script#/Libraries/Node/Neo4J
+// 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;
+using NodeApi;
+
+namespace NodeApi.Neo4j {
+
+    /// <summary>
+    /// The class corresponding to a Neo4j graph database. Start here.
+    /// </summary>
+    [ScriptImport]
+    public class GraphDatabase {
+
+        /// <summary>
+        /// Construct a new client for the Neo4j graph database available at the given (root) URL.
+        /// </summary>
+        /// <param name="url">The root URL where the Neo4j graph database is available, e.g. 'http://localhost:7474/'. This URL should include HTTP Basic Authentication info if needed, e.g. 'http://user:password@example.com/'.</param>
+        /// <example><code>Graph db = new Graph("http://localhost:7474");</code></example>
+        public GraphDatabase(string url) {
+        }
+
+        /// <summary>
+        /// Construct a new client for the Neo4j graph database available at the given (root) URL. 
+        /// </summary>
+        /// <param name="opts">
+        /// <para>url</para>: The root URL where the Neo4j graph database is available, e.g. 'http://localhost:7474/'. This URL should include HTTP Basic Authentication info if needed, e.g. 'http://user:password@example.com/'.
+        /// <para>proxy</para>: An optional proxy URL for all requests.
+        /// </param>
+        /// <example><code>Graph db = new Graph(new Dictionary("url", "http://localhost:7474"));</code></example>
+        public GraphDatabase(Dictionary<string, object> opts) {
+        }
+
+        /// <summary>
+        /// Create and immediately return a new, unsaved node with the given properties.
+        /// Note: This node will not be persisted to the database until and unless its save() method is called.
+        /// </summary>
+        /// <param name="data">The properties this new node should have.</param>
+        /// <returns>Node</returns>
+        public GraphNode CreateNode(Dictionary<string, object> data) {
+            return null;
+        }
+
+        /// <summary>
+        /// Execute and "return" (via callback) the results of the given Gremlin script, optionally passing along the given script parameters 
+        /// (recommended to avoid Gremlin injection security vulnerabilities). Any values in the returned results that represent nodes, relationships 
+        /// or paths are returned as <see cref="GraphNode"/>, <see cref="GraphRelationship"/> or <see cref="GraphPath"/> instances.
+        /// </summary>
+        /// <param name="script">The Gremlin script. Can be multi-line.</param>
+        /// <param name="parameters">A map of parameters for the Gremlin script.</param>
+        /// <param name="callback">Returns List&lt;object&gt;</param>
+        /// <example>
+        /// <code>
+        ///     var script = "g.v(userId).out('likes')";
+        ///
+        ///     var params = {
+        ///       userId: currentUser.id
+        ///     };
+        ///
+        ///     db.execute(script, params, function (err, likes) {
+        ///       if (err) throw err;
+        ///       likes.forEach(function (node) {
+        ///         // ...
+        ///        });
+        ///     });
+        /// </code>
+        /// </example>
+        public void Execute(string script, Dictionary<string, object> parameters, AsyncResultCallback<List<object>> callback) {
+        }
+        
+        /// <summary>
+        /// Fetch and "return" (via callback) the node indexed under the given property and value in the given index. If none exists, returns undefined.
+        /// Note: With this method, at most one node is returned. See <see cref="GetIndexedNodes"/> for returning multiple nodes.
+        /// </summary>
+        /// <param name="index">The name of the index, e.g. 'node_auto_index'.</param>
+        /// <param name="property">The name of the property, e.g. 'username'.</param>
+        /// <param name="value">The value of the property, e.g. 'aseemk'.</param>
+        /// <param name="callback">Returns Node</param>
+        public void GetIndexedNode(string index, string property, object value, AsyncResultCallback<GraphNode> callback) {
+        }
+
+        /// <summary>
+        /// Fetch and "return" (via callback) the nodes indexed under the given property and value in the given index. If no such nodes exist, an empty array is returned.
+        /// Note: This method will return multiple nodes if there are multiple hits. See #getIndexedNode for returning at most one node.
+        /// </summary>
+        /// <param name="index">The name of the index, e.g. 'node_auto_index'.</param>
+        /// <param name="property">The name of the property, e.g. 'platform'.</param>
+        /// <param name="value">The value of the property, e.g. 'xbox'.</param>
+        /// <param name="callback">Returns List&lt;Node&gt;</param>
+        public void GetIndexedNodes(string index, string property, object value, AsyncResultCallback<List<GraphNode>> callback) {
+        }
+
+        /// <summary>
+        /// Fetch and "return" (via callback) the relationship indexed under the given property and value in the given index. If none exists, returns undefined.
+        /// Note: With this method, at most one relationship is returned. See <see cref="GetIndexedRelationships"/> for returning multiple relationships.
+        /// </summary>
+        /// <param name="index">The name of the index, e.g. 'relationship_auto_index'.</param>
+        /// <param name="property">The name of the property, e.g. 'created'.</param>
+        /// <param name="value">The value of the property, e.g. 1346713658393.</param>
+        /// <param name="callback">Returns Relationship</param>
+        public void GetIndexedRelationship(string index, string property, object value, AsyncResultCallback<GraphRelationship> callback) {
+        }
+
+        /// <summary>
+        /// Fetch and "return" (via callback) the relationships indexed under the given property and value in the given index. If no such 
+        /// relationships exist, an empty array is returned.
+        /// Note: This method will return multiple relationships if there are multiple hits. See <see cref="GetIndexedRelationship"/> for returning at most one relationship.
+        /// </summary>
+        /// <param name="index">The name of the index, e.g. 'relationship_auto_index'.</param>
+        /// <param name="property">The name of the property, e.g. 'favorite'.</param>
+        /// <param name="value">The value of the property, e.g. true.</param>
+        /// <param name="callback">Returns List&lt;Relationship&gt;</param>
+        public void GetIndexedRelationships(string index, string property, object value, AsyncResultCallback<List<GraphRelationship>> callback) {
+        }
+
+        /// <summary>
+        /// Fetch and "return" (via callback) the node with the given Neo4j ID.
+        /// </summary>
+        /// <param name="id">The integer ID of the node: <example>1234</example></param>
+        /// <param name="callback">Returns Node</param>
+        /// <exception>If no node exists with this ID.</exception>
+        public void GetNodeById(int id, AsyncResultCallback<GraphNode> callback) {
+        }
+
+        /// <summary>
+        /// Fetch and "return" (via callback) the relationship with the given Neo4j ID.
+        /// </summary>
+        /// <param name="id">The integer ID of the relationship, e.g. 1234.</param>
+        /// <param name="callback">Returns Relationship</param>
+        public void GetRelationshipById(int id, AsyncResultCallback<GraphRelationship> callback) {
+        }
+
+        /// <summary>
+        /// Fetch and "return" (via callback) the Neo4j version as a float.
+        /// </summary>
+        /// <param name="callback">Returns Number</param>
+        public void GetVersion(AsyncResultCallback<long> callback) {
+        }
+
+        /// <summary>
+        /// Fetch and "return" (via callback) the results of the given Cypher query, optionally passing along the given query parameters 
+        /// (recommended to avoid Cypher injection security vulnerabilities). The returned results are an array of "rows" (matches), 
+        /// where each row is a map from key name (as given in the query) to value. Any values that represent nodes, relationships or 
+        /// paths are returned as <see cref="GraphNode"/>, <see cref="GraphRelationship"/> or <see cref="GraphPath"/> instances.
+        /// </summary>
+        /// <param name="query">The Cypher query. Can be multi-line.</param>
+        /// <param name="parameters">A map of parameters for the Cypher query.</param>
+        /// <param name="callback">Returns List&lt;object&gt;</param>
+        /// <example>
+        /// <code>
+        ///      var query = [
+        ///       'START user=node({userId})',
+        ///       'MATCH (user) -[:likes]-> (other)',
+        ///       'RETURN other'
+        ///     ].join('\n');
+        ///     
+        ///     var params = {
+        ///       userId: currentUser.id
+        ///     };
+        ///     
+        ///     db.query(query, params, function (err, results) {
+        ///       if (err) throw err;
+        ///       var likes = results.map(function (result) {
+        ///         return result['other'];
+        ///       });
+        ///       // ...
+        ///     });
+        /// </code>
+        /// </example>
+        public void Query(string query, Dictionary<string, object> parameters, AsyncResultCallback<object> callback) {
+        }
+
+        /// <summary>
+        /// Fetch and "return" (via callback) the nodes matching the given query (in Lucene syntax) from the given index. If no such nodes exist, an empty array is returned.
+        /// </summary>
+        /// <param name="index">The name of the index, e.g. node_auto_index.</param>
+        /// <param name="query">The Lucene query, e.g. foo:bar AND hello:world.</param>
+        /// <param name="callback">Returns List&lt;Node&gt;</param>
+        public void QueryNodeIndex(string index, string query, AsyncResultCallback<List<GraphNode>> callback) {
+        }
+    }
+}
diff --git a/src/Libraries/Node/Node.Neo4j/GraphNode.cs b/src/Libraries/Node/Node.Neo4j/GraphNode.cs
new file mode 100644
index 000000000..b07764906
--- /dev/null
+++ b/src/Libraries/Node/Node.Neo4j/GraphNode.cs
@@ -0,0 +1,125 @@
+// GraphNode.cs
+// Script#/Libraries/Node/Neo4J
+// 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 NodeApi.Neo4j {
+
+    /// <summary>
+    /// The class corresponding to a Neo4j node.
+    /// </summary>
+    [ScriptIgnoreNamespace]
+    [ScriptImport]
+    [ScriptName("Node")]
+    public sealed class GraphNode : GraphPropertyContainer {
+
+        private GraphNode() {
+        }
+
+        /// <summary>
+        /// Persist or update this node in the database.
+        /// </summary>
+        /// <param name="callback">Returns (via callback) this same Node instance after the save.</param>
+        public void Save(AsyncResultCallback<GraphNode> callback) {
+        }
+
+        /// <summary>
+        /// Delete this node from the database. This will throw an error if this node has any relationships on it, unless the 
+        /// force flag is passed in, in which case those relationships are also deleted.
+        /// </summary>
+        /// <param name="callback"></param>
+        /// <param name="force">If this node has any relationships on it, whether those relationships should be deleted as well. Note: For safety, it's recommended to not pass the force flag and instead manually and explicitly delete known relationships beforehand.</param>
+        public void Delete(AsyncResultCallback<GraphNode> callback, bool force) {
+        }
+
+        /// <summary>
+        /// Add this node to the given index under the given key-value pair.
+        /// </summary>
+        /// <param name="index">The name of the index, e.g. 'users'.</param>
+        /// <param name="key">The key to index under, e.g. 'username'</param>
+        /// <param name="value">The value to index under, e.g. 'aseemk'.</param>
+        /// <param name="callback"></param>
+        public void Index(string index, string key, object value, AsyncResultCallback<GraphNode> callback) {
+        }
+
+        /// <summary>
+        /// Create and "return" (via callback) a relationship of the given type and with the given properties from this node to another node.
+        /// </summary>
+        /// <param name="otherNode">Node to create a relationship to</param>
+        /// <param name="type">Type of relationship</param>
+        /// <param name="data">The properties this relationship should have.</param>
+        /// <param name="callback">Returns a Relationship</param>
+        public void CreateRelationshipTo(GraphNode otherNode, string type, Dictionary<string, object> data, AsyncResultCallback<GraphRelationship> callback) {
+        }
+
+        /// <summary>
+        /// Create and "return" (via callback) a relationship of the given type and with the given properties from another node to this node.
+        /// </summary>
+        /// <param name="otherNode">Node to create a relationship to</param>
+        /// <param name="type">Type of relationship</param>
+        /// <param name="data">The properties this relationship should have.</param>
+        /// <param name="callback">Returns a Relationship</param>
+        /// <returns></returns>
+        public void CreateRelationshipFrom(GraphNode otherNode, string type, Dictionary<string, object> data, AsyncResultCallback<GraphRelationship> callback) {
+        }
+
+        /// <summary>
+        /// Fetch and "return" (via callback) the relationships of the given type or types from or to this node.
+        /// </summary>
+        /// <param name="types">The types of Relationships to return</param>
+        /// <param name="callback">Returns a list of Relationships</param>
+        /// <returns></returns>
+        public void GetRelationships(List<string> types, AsyncResultCallback<List<GraphRelationship>> callback) {
+        }
+
+        /// <summary>
+        /// Fetch and "return" (via callback) the relationships of the given type or types from this node.
+        /// </summary>
+        /// <param name="types">The types of outgoing Relationships</param>
+        /// <param name="callback">Returns a list of Relationships</param>
+        /// <returns></returns>
+        public void Outgoing(List<string> types, AsyncResultCallback<List<GraphRelationship>> callback) {
+        }
+
+        /// <summary>
+        /// Fetch and "return" (via callback) the Relationships of the given type or types to this node.
+        /// </summary>
+        /// <param name="types">The types of incoming Relationships</param>
+        /// <param name="callback">Returns a list of Relationships</param>
+        /// <returns></returns>
+        public void Incoming(List<string> types, AsyncResultCallback<List<GraphRelationship>> callback) {
+        }
+
+        /// <summary>
+        /// Fetch and "return" (via callback) the Relationships of the given type or types from or to this node.
+        /// </summary>
+        /// <param name="types">The types of incoming or outgoing Relationships</param>
+        /// <param name="callback">Returns a list of Relationships</param>
+        public void All(List<string> types, AsyncResultCallback<List<GraphRelationship>> callback) {
+        }
+
+        /// <summary>
+        /// Fetch and "return" (via callback) the nodes adjacent to this one following only relationships of the given type(s) and/or direction(s).
+        /// </summary>
+        /// <param name="rels">It can be an array of string types, e.g. ['likes', 'loves'].</param>
+        /// <param name="callback">Returns a list of Nodes</param>
+        public void GetRelationshipNodes(List<String> rels, AsyncResultCallback<List<GraphNode>> callback) {
+        }
+
+        /// <summary>
+        /// Fetch and "return" (via callback) the shortest path, if there is one, from this node to the given node. Returns null if no path exists.
+        /// </summary>
+        /// <param name="to">Destination node to find the shortest path to</param>
+        /// <param name="type">The type of relationship to follow.</param>
+        /// <param name="direction">One of 'in', 'out', or 'all'.</param>
+        /// <param name="maxDepth">The maximum number of relationships to follow when searching for paths. The default is 1.</param>
+        /// <param name="algorithm">This needs to be 'shortestPath' for now.</param>
+        /// <param name="callback">Returns a <see cref="Path"/></param>
+        public void Path(GraphNode to, string type, string direction, Int32 maxDepth, string algorithm, AsyncResultCallback<GraphPath> callback) {
+        }
+    }
+}
diff --git a/src/Libraries/Node/Node.Neo4j/GraphPath.cs b/src/Libraries/Node/Node.Neo4j/GraphPath.cs
new file mode 100644
index 000000000..45aa7b1d6
--- /dev/null
+++ b/src/Libraries/Node/Node.Neo4j/GraphPath.cs
@@ -0,0 +1,73 @@
+// GraphPath.cs
+// Script#/Libraries/Node/Neo4J
+// 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 NodeApi.Neo4j {
+
+    /// <summary>
+    /// The class corresponding to a Neo4j path.
+    /// </summary>
+    [ScriptIgnoreNamespace]
+    [ScriptImport]
+    [ScriptName("Path")]
+    public sealed class GraphPath {
+
+        private GraphPath() {
+        }
+
+        /// <summary>
+        /// The node that this path ends at.
+        /// </summary>
+        [ScriptField]
+        public GraphNode End {
+            get {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// The length of this path
+        /// </summary>
+        [ScriptField]
+        public int Length {
+            get {
+                return -1;
+            }
+        }
+
+        /// <summary>
+        /// The nodes that make up this path.
+        /// </summary>
+        [ScriptField]
+        public List<GraphNode> Nodes {
+            get {
+                return null;
+            }
+        }
+        
+        /// <summary>
+        /// The relationships that make up this path.
+        /// </summary>
+        [ScriptField]
+        public List<GraphRelationship> Relationships {
+            get {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// The node that this path starts at.
+        /// </summary>
+        [ScriptField]
+        public GraphNode Start {
+            get {
+                return null;
+            }
+        }
+    }
+}
diff --git a/src/Libraries/Node/Node.Neo4j/GraphPropertyContainer.cs b/src/Libraries/Node/Node.Neo4j/GraphPropertyContainer.cs
new file mode 100644
index 000000000..b6e10a3b0
--- /dev/null
+++ b/src/Libraries/Node/Node.Neo4j/GraphPropertyContainer.cs
@@ -0,0 +1,80 @@
+// GraphPropertyContainer.cs
+// Script#/Libraries/Node/Neo4J
+// 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 NodeApi.Neo4j {
+
+    /// <summary>
+    /// The abstract class corresponding to a Neo4j property container.
+    /// </summary>
+    [ScriptIgnoreNamespace]
+    [ScriptImport]
+    [ScriptName("PropertyContainer")]
+    public abstract class GraphPropertyContainer {
+
+        internal GraphPropertyContainer() {
+        }
+
+        /// <summary>
+        /// Whether this property container exists in (has been persisted to) the Neo4j database.
+        /// </summary>
+        [ScriptField]
+        public bool Exists {
+            get {
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// This property container's properties. This is a map of key-value pairs.
+        /// </summary>
+        [ScriptField]
+        public Dictionary<string, object> Data {
+            get {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// If this property container exists, its Neo4j integer ID.
+        /// </summary>
+        [ScriptField]
+        public int Id {
+            get {
+                return -1;
+            }
+        }
+
+        /// <summary>
+        /// The URL of this property container.
+        /// </summary>
+        [ScriptField]
+        public string Self {
+            get {
+                return string.Empty;
+            }
+        }
+        
+        /// <summary>
+        /// Delete this property container from the database.
+        /// </summary>
+        /// <param name="callback">Callback function to execute when the delete operation is complete</param>
+        [ScriptName("del")]
+        public void Delete(AsyncResultCallback<object> callback) {
+        }
+
+        /// <summary>
+        /// Test whether the given object represents the same property container as this one. They can be separate instances with separate data.
+        /// </summary>
+        /// <param name="other">Object to compare for equality</param>
+        /// <returns>True if equal</returns>
+        public bool Equals(object other) {
+            return false;
+        }
+    }
+}
diff --git a/src/Libraries/Node/Node.Neo4j/GraphRelationship.cs b/src/Libraries/Node/Node.Neo4j/GraphRelationship.cs
new file mode 100644
index 000000000..92fa57af3
--- /dev/null
+++ b/src/Libraries/Node/Node.Neo4j/GraphRelationship.cs
@@ -0,0 +1,69 @@
+// GraphRelationship.cs
+// Script#/Libraries/Node/Neo4J
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace NodeApi.Neo4j {
+
+    /// <summary>
+    /// The class corresponding to a Neo4j relationship.
+    /// </summary>
+    [ScriptIgnoreNamespace]
+    [ScriptImport]
+    [ScriptName("Relationship")]
+    public sealed class GraphRelationship : GraphPropertyContainer {
+
+        private GraphRelationship() {
+        }
+
+        /// <summary>
+        /// The node this relationship goes to.
+        /// </summary>
+        [ScriptField]
+        public GraphNode End {
+            get {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// The node this relationship goes from.
+        /// </summary>
+        [ScriptField]
+        public GraphNode Start {
+            get {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// This relationship's type.
+        /// </summary>
+        [ScriptField]
+        public string Type {
+            get {
+                return String.Empty;
+            }
+        }
+
+        /// <summary>
+        /// Add this relationship to the given relationship index under the given property key and value.
+        /// </summary>
+        /// <param name="index">The name of the index, e.g. 'likes'.</param>
+        /// <param name="key">The property key to index under, e.g. 'created'.</param>
+        /// <param name="value">The property value to index under, e.g. 1346713658393.</param>
+        /// <param name="callback"></param>
+        public void Index(string index, string key, object value, AsyncResultCallback<GraphNode> callback) {
+        }
+
+        /// <summary>
+        /// Persist or update this relationship in the database. "Returns" (via callback) this same instance after the save.
+        /// </summary>
+        /// <param name="callback">Returns a Relationship</param>
+        public void Save(AsyncResultCallback<GraphRelationship> callback) {
+        }
+    }
+}
diff --git a/src/Libraries/Node/Node.Neo4j/Node.Neo4J.csproj b/src/Libraries/Node/Node.Neo4j/Node.Neo4J.csproj
new file mode 100644
index 000000000..100c4afe5
--- /dev/null
+++ b/src/Libraries/Node/Node.Neo4j/Node.Neo4J.csproj
@@ -0,0 +1,64 @@
+<?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>{232445FF-22AA-46F7-BA12-4590C670F2B1}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <FileAlignment>512</FileAlignment>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Node.Neo4j</RootNamespace>
+    <AssemblyName>Script.Node.Neo4j</AssemblyName>
+    <NoStdLib>True</NoStdLib>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\..\..\ScriptSharp.snk</AssemblyOriginatorKeyFile>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
+  </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\Script.Node.Neo4j.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\Script.Node.Neo4j.xml</DocumentationFile>
+  </PropertyGroup>
+  <ItemGroup>
+    <ScriptInfo Include="Properties\ScriptInfo.txt" />
+    <Compile Include="..\..\..\ScriptSharp.cs">
+      <Link>Properties\ScriptSharp.cs</Link>
+    </Compile>
+    <Compile Include="GraphPath.cs" />
+    <Compile Include="GraphPropertyContainer.cs" />
+    <Compile Include="GraphRelationship.cs" />
+    <Compile Include="GraphDatabase.cs" />
+    <Compile Include="GraphNode.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Core\CoreLib\CoreLib.csproj">
+      <Project>{36D4B098-A21C-4725-ACD3-400922885F38}</Project>
+      <Name>CoreLib</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Node.Core\Node.Core.csproj">
+      <Project>{4a9f7ce9-5a45-4b28-ad01-05528709b6e4}</Project>
+      <Name>Node.Core</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/Node/Node.Neo4j/Properties/AssemblyInfo.cs b/src/Libraries/Node/Node.Neo4j/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..29314fa45
--- /dev/null
+++ b/src/Libraries/Node/Node.Neo4j/Properties/AssemblyInfo.cs
@@ -0,0 +1,11 @@
+// AssemblyInfo.cs
+// Script#/Libraries/Node/Neo4J
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Reflection;
+
+[assembly: AssemblyTitle("Script.Node.Neo4J")]
+[assembly: AssemblyDescription("Script# NodeJS Neo4j Client Library API")]
+[assembly: ScriptAssembly("neo4j")]
diff --git a/src/Libraries/Node/Node.Neo4j/Properties/ScriptInfo.txt b/src/Libraries/Node/Node.Neo4j/Properties/ScriptInfo.txt
new file mode 100644
index 000000000..e55f8bc14
--- /dev/null
+++ b/src/Libraries/Node/Node.Neo4j/Properties/ScriptInfo.txt
@@ -0,0 +1,14 @@
+Node-Neo4J Client Library
+===============================================================================
+
+This assembly provides access to the Neo4j Graph Database APIs for NodeJS applications.
+This is only meant for use at development time, so you can reference and compile 
+your c# code against the Node-Neo4j APIs.
+
+You must install the neo4j package for runtime functionality and install the Neo4j database.
+
+More info on Node-Neo4j is on https://github.com/thingdom/node-neo4j
+
+More info on Neo4j is on http://www.neo4j.org/
+
+-------------------------------------------------------------------------------
diff --git a/src/Libraries/Node/Node.Restify/Node.Restify.csproj b/src/Libraries/Node/Node.Restify/Node.Restify.csproj
new file mode 100644
index 000000000..fbfbea917
--- /dev/null
+++ b/src/Libraries/Node/Node.Restify/Node.Restify.csproj
@@ -0,0 +1,81 @@
+<?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>{1ECC689C-2542-4EE8-8A86-7627E63F44F8}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>NodeApi.Restify</RootNamespace>
+    <AssemblyName>Script.Node.Restify</AssemblyName>
+    <NoStdLib>True</NoStdLib>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\..\..\ScriptSharp.snk</AssemblyOriginatorKeyFile>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>..\..\..\..\bin\Debug\</OutputPath>
+    <DebugSymbols>false</DebugSymbols>
+    <DefineConstants>DEBUG</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>..\..\..\..\bin\Debug\Script.Node.Restify.xml</DocumentationFile>
+    <NoWarn>1591, 0661, 0660, 1684</NoWarn>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>none</DebugType>
+    <DebugSymbols>false</DebugSymbols>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\..\..\bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>..\..\..\..\bin\Release\Script.Node.Restify.xml</DocumentationFile>
+    <NoWarn>1591, 0661, 0660, 1684</NoWarn>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\..\ScriptSharp.cs">
+      <Link>Properties\ScriptSharp.cs</Link>
+    </Compile>
+    <ScriptInfo Include="Properties\ScriptInfo.txt" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="RestifyLogger.cs" />
+    <Compile Include="RestifyApplication.cs" />
+    <Compile Include="RestifyCallback.cs" />
+    <Compile Include="RestifyChain.cs" />
+    <Compile Include="RestifyError.cs" />
+    <Compile Include="RestifyHandler.cs" />
+    <Compile Include="RestifyHttpClient.cs" />
+    <Compile Include="RestifyJsonClient.cs" />
+    <Compile Include="RestifyJsonClientOptions.cs" />
+    <Compile Include="RestifyRequest.cs" />
+    <Compile Include="RestifyResponse.cs" />
+    <Compile Include="RestifyRoute.cs" />
+    <Compile Include="RestifyServer.cs" />
+    <Compile Include="RestifyServerGetOptions.cs" />
+    <Compile Include="RestifyServerOptions.cs" />
+    <Compile Include="RestifyStringClient.cs" />
+    <Compile Include="RestifyThrottleOptions.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Core\CoreLib\CoreLib.csproj">
+      <Project>{36d4b098-a21c-4725-acd3-400922885f38}</Project>
+      <Name>CoreLib</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Node.Core\Node.Core.csproj">
+      <Project>{4a9f7ce9-5a45-4b28-ad01-05528709b6e4}</Project>
+      <Name>Node.Core</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Target Name="AfterBuild">
+    <Copy SourceFiles="@(ScriptInfo)" DestinationFiles="$(OutputPath)$(AssemblyName).txt" />
+  </Target>
+  <Import Project="..\..\..\packages\ScriptSharp.0.8\tools\ScriptSharp.targets" Condition="Exists('..\..\..\packages\ScriptSharp.0.8\tools\ScriptSharp.targets')" />
+</Project>
\ No newline at end of file
diff --git a/src/Libraries/Node/Node.Restify/Properties/AssemblyInfo.cs b/src/Libraries/Node/Node.Restify/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..d1497e2e9
--- /dev/null
+++ b/src/Libraries/Node/Node.Restify/Properties/AssemblyInfo.cs
@@ -0,0 +1,11 @@
+// AssemblyInfo.cs
+// Script#/Libraries/Node/Restify
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Reflection;
+
+[assembly: AssemblyTitle("Script.Node.Restify")]
+[assembly: AssemblyDescription("Script# NodeJS Restify Module API")]
+[assembly: ScriptAssembly("restify")]
diff --git a/src/Libraries/Node/Node.Restify/Properties/ScriptInfo.txt b/src/Libraries/Node/Node.Restify/Properties/ScriptInfo.txt
new file mode 100644
index 000000000..afd792f38
--- /dev/null
+++ b/src/Libraries/Node/Node.Restify/Properties/ScriptInfo.txt
@@ -0,0 +1,10 @@
+Node Restify Module
+===============================================================================
+
+This assembly provides access to Restify Module APIs for NodeJS applications.
+This is only meant for use at development time, so you can reference and compile
+your c# code against restify APIs.
+
+More information is on http://mcavage.github.com/node-restify/.
+
+-------------------------------------------------------------------------------
diff --git a/src/Libraries/Node/Node.Restify/RestifyApplication.cs b/src/Libraries/Node/Node.Restify/RestifyApplication.cs
new file mode 100644
index 000000000..101757d08
--- /dev/null
+++ b/src/Libraries/Node/Node.Restify/RestifyApplication.cs
@@ -0,0 +1,80 @@
+// Restify.cs
+// Script#/Libraries/Node/Restify
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace NodeApi.Restify {
+
+    [ScriptImport]
+    [ScriptIgnoreNamespace]
+    [ScriptName("restify")]
+    public static class RestifyApplication {
+
+        public static RestifyChainedHandler[] AcceptParser(string[] serverAcceptable) {
+            return null;
+        }
+
+        public static RestifyChainedHandler[] AuthorizationParser() {
+            return null;
+        }
+
+        public static RestifyChainedHandler[] BodyParser() {
+            return null;
+        }
+
+        public static RestifyChainedHandler[] ConditionalRequest() {
+            return null;
+        }
+
+        public static RestifyHttpClient CreateHttpClient() {
+            return null;
+        }
+
+        public static RestifyJsonClient CreateJsonClient() {
+            return null;
+        }
+
+        public static RestifyJsonClient CreateJsonClient(RestifyJsonClientOptions options) {
+            return null;
+        }
+
+        public static RestifyServer CreateServer() {
+            return null;
+        }
+
+        public static RestifyServer CreateServer(RestifyServerOptions rs) {
+            return null;
+        }
+
+        public static RestifyStringClient CreateStringClient() {
+            return null;
+        }
+        
+        public static RestifyChainedHandler[] DateParser() {
+            return null;
+        }
+
+        public static RestifyChainedHandler[] GZipResponse() {
+            return null;
+        }
+
+        public static RestifyChainedHandler[] JsonBodyParser() {
+            return null;
+        }
+
+        public static RestifyChainedHandler[] Jsonp() {
+            return null;
+        }
+
+        public static RestifyChainedHandler QueryParser() {
+            return null;
+        }
+
+        public static RestifyChainedHandler[] Throttle(RestifyThrottleOptions options) {
+            return null;
+        }
+    }
+}
diff --git a/src/Libraries/Node/Node.Restify/RestifyCallback.cs b/src/Libraries/Node/Node.Restify/RestifyCallback.cs
new file mode 100644
index 000000000..5bc17aadd
--- /dev/null
+++ b/src/Libraries/Node/Node.Restify/RestifyCallback.cs
@@ -0,0 +1,9 @@
+// RestifyCallback.cs
+// Script#/Libraries/Node/Restify
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+namespace NodeApi.Restify {
+
+    public delegate void RestifyCallback(RestifyError error, RestifyRequest request, RestifyResponse response, object content);
+}
diff --git a/src/Libraries/Node/Node.Restify/RestifyChain.cs b/src/Libraries/Node/Node.Restify/RestifyChain.cs
new file mode 100644
index 000000000..0c61351ad
--- /dev/null
+++ b/src/Libraries/Node/Node.Restify/RestifyChain.cs
@@ -0,0 +1,26 @@
+// RestifyChain.cs
+// Script#/Libraries/Node/Restify
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace NodeApi.Restify {
+
+    [ScriptIgnoreNamespace]
+    [ScriptImport]
+    public sealed class RestifyChain {
+
+        private RestifyChain() {
+        }
+
+        [ScriptSkip]
+        public void Continue() {
+        }
+
+        [ScriptSkip]
+        public void Error(Exception error) {
+        }
+    }
+}
diff --git a/src/Libraries/Node/Node.Restify/RestifyError.cs b/src/Libraries/Node/Node.Restify/RestifyError.cs
new file mode 100644
index 000000000..6d5f6cec5
--- /dev/null
+++ b/src/Libraries/Node/Node.Restify/RestifyError.cs
@@ -0,0 +1,17 @@
+// RestifyError.cs
+// Script#/Libraries/Node/Restify
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Runtime.CompilerServices;
+
+namespace NodeApi.Restify {
+    
+    [ScriptIgnoreNamespace]
+    [ScriptImport]
+    public sealed class RestifyError {
+
+        internal RestifyError() {
+        }
+    }
+}
diff --git a/src/Libraries/Node/Node.Restify/RestifyHandler.cs b/src/Libraries/Node/Node.Restify/RestifyHandler.cs
new file mode 100644
index 000000000..111182019
--- /dev/null
+++ b/src/Libraries/Node/Node.Restify/RestifyHandler.cs
@@ -0,0 +1,18 @@
+// RestifyHandler.cs
+// Script#/Libraries/Node/Restify
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace NodeApi.Restify {
+
+    [ScriptImport]
+    [ScriptIgnoreNamespace]
+    public delegate void RestifyHandler(RestifyRequest request, RestifyResponse response);
+
+    [ScriptImport]
+    [ScriptIgnoreNamespace]
+    public delegate RestifyChainedHandler RestifyChainedHandler(RestifyRequest request, RestifyResponse response, Func<bool, RestifyChainedHandler> next);
+}
diff --git a/src/Libraries/Node/Node.Restify/RestifyHttpClient.cs b/src/Libraries/Node/Node.Restify/RestifyHttpClient.cs
new file mode 100644
index 000000000..6e71a5b40
--- /dev/null
+++ b/src/Libraries/Node/Node.Restify/RestifyHttpClient.cs
@@ -0,0 +1,17 @@
+// RestifyHttpClient.cs
+// Script#/Libraries/Node/Restify
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Runtime.CompilerServices;
+
+namespace NodeApi.Restify {
+
+    [ScriptImport]
+    [ScriptIgnoreNamespace]
+    public sealed class RestifyHttpClient : RestifyStringClient {
+     
+        private RestifyHttpClient() {
+        }
+    }
+}
diff --git a/src/Libraries/Node/Node.Restify/RestifyJsonClient.cs b/src/Libraries/Node/Node.Restify/RestifyJsonClient.cs
new file mode 100644
index 000000000..f97c0f957
--- /dev/null
+++ b/src/Libraries/Node/Node.Restify/RestifyJsonClient.cs
@@ -0,0 +1,21 @@
+// RestifyJsonClient.cs
+// Script#/Libraries/Node/Restify
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Collections;
+using System.Runtime.CompilerServices;
+
+namespace NodeApi.Restify {
+
+    /// <summary>
+    /// sends and expects application/json
+    /// </summary>
+    [ScriptImport]
+    [ScriptIgnoreNamespace]
+    public sealed class RestifyJsonClient : RestifyStringClient {
+
+        private RestifyJsonClient() {
+        }
+    }
+}
diff --git a/src/Libraries/Node/Node.Restify/RestifyJsonClientOptions.cs b/src/Libraries/Node/Node.Restify/RestifyJsonClientOptions.cs
new file mode 100644
index 000000000..082f1e5ba
--- /dev/null
+++ b/src/Libraries/Node/Node.Restify/RestifyJsonClientOptions.cs
@@ -0,0 +1,78 @@
+// RestifyJsonClientOptions.cs
+// Script#/Libraries/Node/Restify
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace NodeApi.Restify {
+
+    [ScriptImport]
+    [ScriptIgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class RestifyJsonClientOptions {
+
+        public RestifyJsonClientOptions() {
+        }
+
+        public RestifyJsonClientOptions(params object[] nameValuePairs) {
+        }
+
+        /// <summary>
+        /// Accept header to send
+        /// </summary>
+        public string Accept;
+
+        /// <summary>
+        /// Amount of time to wait for a socket
+        /// </summary>
+        public int ConnectTimeout;
+
+        /// <summary>
+        /// node-dtrace-provider handle
+        /// </summary>
+        [ScriptName("dtrace")]
+        public object DTrace;
+
+        /// <summary>
+        /// Will compress data when sent using content-encoding: gzip
+        /// </summary>
+        public object Gzip;
+
+        /// <summary>
+        /// HTTP headers to set in all requests
+        /// </summary>
+        public object Headers;
+        
+        /// <summary>
+        /// bunyan instance
+        /// </summary>
+        public object Log;
+        
+        /// <summary>
+        /// options to provide to node-retry; defaults to 3 retries
+        /// </summary>
+        public object Retry;
+        
+        /// <summary>
+        /// synchronous callback for interposing headers before request is sent
+        /// </summary>
+        public Action SignRequest;
+        
+        /// <summary>
+        /// Fully-qualified URL to connect to
+        /// </summary>
+        public string Url;
+        
+        /// <summary>
+        /// user-agent string to use; restify inserts one, but you can override it
+        /// </summary>
+        public string UserAgent;
+
+        /// <summary>
+        /// semver string to set the accept-version
+        /// </summary>
+        public string Version;
+    }
+}
diff --git a/src/Libraries/Node/Node.Restify/RestifyLogger.cs b/src/Libraries/Node/Node.Restify/RestifyLogger.cs
new file mode 100644
index 000000000..f98dc8245
--- /dev/null
+++ b/src/Libraries/Node/Node.Restify/RestifyLogger.cs
@@ -0,0 +1,23 @@
+// BunyanLogger.cs
+// Script#/Libraries/Node/Restify
+// 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 NodeApi.Restify {
+    
+    [ScriptIgnoreNamespace]
+    [ScriptImport]
+    [ScriptName("Object")]
+    public sealed class RestifyLogger {
+
+        private RestifyLogger() {
+        }
+
+        public void Debug(object options, string format, params string[] formatArguments) {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Libraries/Node/Node.Restify/RestifyRequest.cs b/src/Libraries/Node/Node.Restify/RestifyRequest.cs
new file mode 100644
index 000000000..a982abe2f
--- /dev/null
+++ b/src/Libraries/Node/Node.Restify/RestifyRequest.cs
@@ -0,0 +1,210 @@
+// RestifyRequest.cs
+// Script#/Libraries/Node/Restify
+// 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;
+using NodeApi.Network;
+
+namespace NodeApi.Restify {
+
+    [ScriptIgnoreNamespace]
+    [ScriptImport]
+    public sealed class RestifyRequest {
+
+        private RestifyRequest() {
+        }
+
+        [ScriptField]
+        public Socket Connection {
+            get {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// short hand for the header content-length
+        /// </summary>
+        [ScriptField]
+        public int ContentLength {
+            get {
+                return 0;
+            }
+        }
+
+        /// <summary>
+        /// short hand for the header content-type
+        /// </summary>
+        [ScriptField]
+        public string ContentType {
+            get {
+                return String.Empty;
+            }
+        }
+
+        [ScriptField]
+        public object Headers {
+            get {
+                return null;
+            }
+        }
+        
+        /// <summary>
+        /// url.parse(req.url) href
+        /// </summary>
+        [ScriptField]
+        public string Href {
+            get {
+                return String.Empty;
+            }
+        }
+
+        [ScriptField]
+        public string HttpVersion {
+            get {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// A unique request id (x-request-id)
+        /// </summary>
+        [ScriptField]
+        public string Id {
+            get {
+                return String.Empty;
+            }
+        }
+
+        /// <summary>
+        /// bunyan logger you can piggyback on
+        /// </summary>
+        [ScriptField]
+        public RestifyLogger Log {
+            get {
+                return null;
+            }
+        }
+
+        [ScriptField]
+        public HttpVerb Method {
+            get {
+                return HttpVerb.GET;
+            }
+        }
+        
+        [ScriptField]
+        [ScriptName("params")]
+        public Dictionary<string, string> Parameters {
+            get {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// cleaned up URL path
+        /// </summary>
+        [ScriptField]
+        public string Path {
+            get {
+                return String.Empty;
+            }
+        }
+
+        /// <summary>
+        /// the query string only
+        /// </summary>
+        [ScriptField]
+        public string Query {
+            get {
+                return String.Empty;
+            }
+        }
+
+        /// <summary>
+        /// Whether this was an SSL request
+        /// </summary>
+        [ScriptField]
+        public bool Secure {
+            get {
+                return true;
+            }
+        }
+        
+        /// <summary>
+        /// the time when this request arrived (ms since epoch)
+        /// </summary>
+        [ScriptField]
+        [ScriptName("time")]
+        public int TimeInMilliseconds {
+            get {
+                return 0;
+            }
+        }
+
+        [ScriptField]
+        public object Trailers {
+            get {
+                return null;
+            }
+        }
+
+        [ScriptField]
+        public string Url {
+            get {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Check if the Accept header is present, and includes the given type.
+        /// </summary>
+        /// <param name="type"></param>
+        /// <returns></returns>
+        [ScriptName("accepts")]
+        public bool AcceptsContentType(string type) {
+            return true;
+        }
+
+        /// <summary>
+        /// Check if the Accept header is present, and includes the given types.
+        /// </summary>
+        /// <param name="types"></param>
+        /// <returns></returns>
+        [ScriptName("accepts")]
+        public bool AcceptsContentType(string[] types) {
+            return true;
+        }
+
+        [ScriptName("header")]
+        public string GetHeader(string name) {
+            return String.Empty;
+        }
+
+        [ScriptName("header")]
+        public string GetHeader(string key, string defaultValue) {
+            return String.Empty;
+        }
+
+        /// <summary>
+        /// Shorthand to grab a new bunyan instance that is a child component of the one restify has:
+        /// </summary>
+        /// <param name="name"></param>
+        /// <returns></returns>
+        public RestifyLogger GetLogger(string name) {
+            return null;
+        }
+
+        /// <summary>
+        /// Check if the incoming request contains the Content-Type header field, and it contains the give mime type.
+        /// </summary>
+        /// <param name="type"></param>
+        /// <returns></returns>
+        [ScriptName("is")]
+        public bool IsContentType(string type) {
+            return true;
+        }
+    }
+}
diff --git a/src/Libraries/Node/Node.Restify/RestifyResponse.cs b/src/Libraries/Node/Node.Restify/RestifyResponse.cs
new file mode 100644
index 000000000..ddb2bb85b
--- /dev/null
+++ b/src/Libraries/Node/Node.Restify/RestifyResponse.cs
@@ -0,0 +1,159 @@
+// RestifyResponse.cs
+// Script#/Libraries/Node/Restify
+// 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;
+using NodeApi.Network;
+
+namespace NodeApi.Restify {
+
+    [ScriptIgnoreNamespace]
+    [ScriptImport]
+    public sealed class RestifyResponse {
+
+        private RestifyResponse() {
+        }
+
+        /// <summary>
+        /// In conjunction with contentType, you can explicitly set the charSet to be written in the content-type header
+        /// </summary>
+        [ScriptField]
+        public string CharSet {
+            get {
+                return String.Empty;
+            }
+        }
+        
+        /// <summary>
+        /// short hand for the header content-length
+        /// </summary>
+        [ScriptField]
+        public int ContentLength {
+            get {
+                return 0;
+            }
+        }
+
+        /// <summary>
+        /// short hand for the header content-type
+        /// </summary>
+        [ScriptField]
+        public string ContentType {
+            get {
+                return String.Empty;
+            }
+        }
+
+        /// <summary>
+        /// response headers
+        /// </summary>
+        [ScriptField]
+        public Dictionary<string, object> Headers {
+            get {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// HTTP status code
+        /// </summary>
+        [ScriptName("code")]
+        [ScriptField]
+        public int HttpStatusCode {
+            get {
+                return 0;
+            }
+        }
+
+        /// <summary>
+        /// A unique request id (x-request-id)
+        /// </summary>
+        [ScriptField]
+        public string Id {
+            get {
+                return String.Empty;
+            }
+        }
+
+        [ScriptField]
+        public int StatusCode {
+            get;
+            set;
+        }
+
+        public void AddTrailers(Dictionary<string, string> headers) {
+        }
+
+        public string GetHeader(string name) {
+            return null;
+        }
+
+        /// <summary>
+        /// Short-hand for:
+        /// res.contentType = 'json';
+        /// res.send({hello: 'world'});
+        /// </summary>
+        /// <param name="code">Status code</param>
+        /// <param name="body">content</param>
+        public void Json(HttpStatusCode code, object body) {
+        }
+
+        public void RemoveHeader(string name) {
+        }
+
+
+        public void Send(object message) {
+        }
+
+        public void Send(int errorCode, RestifyError message) {
+        }
+
+        public void SendDate() {
+        }
+
+        /// <summary>
+        /// Sets the cache-control header. 
+        /// </summary>
+        /// <param name="type">type defaults to _public_</param>
+        /// <param name="options">options currently only takes maxAge.</param>
+        public void SetCache(string type, Dictionary<string, object> options) {
+        }
+
+        public void SetHeader(string name, string value) {
+        }
+
+        /// <summary>
+        /// Sets the response statusCode.
+        /// </summary>
+        /// <param name="code">Status code</param>
+        public void Status(HttpStatusCode code) {
+        }
+
+        /// <summary>
+        /// You can use send() to wrap up all the usual writeHead(), write(), end() calls on the HTTP API of node. 
+        /// When you call send(), restify figures out how to format the response (see content-negotiation, above), and does that.
+        /// </summary>
+        /// <param name="code">Status Code</param>
+        /// <param name="body">body can be an Object, a Buffer, or an Error. </param>
+        public void Status(HttpStatusCode code, object body) {
+        }
+
+        public void WriteContinue() {
+        }
+
+        public void WriteHead(HttpStatusCode statusCode) {
+        }
+
+        public void WriteHead(HttpStatusCode statusCode, string reasonPhrase) {
+        }
+
+        public void WriteHead(HttpStatusCode statusCode, Dictionary<string, string> headers) {
+        }
+
+        public void WriteHead(HttpStatusCode statusCode, string reasonPhrase, Dictionary<string, string> headers) {
+        }
+    }
+}
diff --git a/src/Libraries/Node/Node.Restify/RestifyRoute.cs b/src/Libraries/Node/Node.Restify/RestifyRoute.cs
new file mode 100644
index 000000000..7b28b1e03
--- /dev/null
+++ b/src/Libraries/Node/Node.Restify/RestifyRoute.cs
@@ -0,0 +1,17 @@
+// RestifyRoute.cs
+// Script#/Libraries/Node/Restify
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Runtime.CompilerServices;
+
+namespace NodeApi.Restify {
+
+    [ScriptIgnoreNamespace]
+    [ScriptImport]
+    public sealed class RestifyRoute {
+
+        private RestifyRoute() {
+        }
+    }
+}
diff --git a/src/Libraries/Node/Node.Restify/RestifyServer.cs b/src/Libraries/Node/Node.Restify/RestifyServer.cs
new file mode 100644
index 000000000..f7043678f
--- /dev/null
+++ b/src/Libraries/Node/Node.Restify/RestifyServer.cs
@@ -0,0 +1,315 @@
+    // RestifyServer.cs
+// Script#/Libraries/Node/Restify
+// 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 NodeApi.Restify {
+
+    [ScriptIgnoreNamespace]
+    [ScriptImport]
+    public sealed class RestifyServer {
+
+        private RestifyServer() {
+        }
+
+        /// <summary>
+        /// list of content-types this server can respond with
+        /// </summary>
+        [ScriptField]
+        public String[] Acceptable {
+            get {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// bunyan instance
+        /// </summary>
+        [ScriptField]
+        public RestifyLogger Log {
+            get {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// name of the server
+        /// </summary>
+        [ScriptField]
+        public string Name {
+            get {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Once listen() is called, this will be filled in with where the server is running
+        /// </summary>
+        [ScriptField]
+        public string Url {
+            get {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// default version to use in all routes
+        /// </summary>
+        [ScriptField]
+        public string Version {
+            get {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Emitted after a route has finished all the handlers you registered.
+        /// You can use this to write audit logs, etc. The route parameter will be the Route object that ran.
+        /// Note that when you are using the default 404/405/BadVersion handlers, this event will still be fired,
+        /// but route will be null. If you have registered your own listeners for those, this event will not be fired
+        /// unless you invoke the cb argument that is provided with them.
+        /// </summary>
+        [ScriptEvent("on", "removeListener")]
+        public event Action After {
+            add {
+            }
+            remove {
+            }
+        }
+
+        /// <summary>
+        /// When a client request is sent for a URL that does exist, but you have not registered a route for that HTTP verb,
+        /// restify will emit this event. Note that restify checks for listeners on this event, and if there are none,
+        /// responds with a default 405 handler. It is expected that if you listen for this event, you respond to the client.
+        /// </summary>
+        [ScriptEvent("on", "removeListener")]
+        [ScriptName("MethodNotAllowed")]
+        public event Action MethodNotAllowed {
+            add {
+            }
+            remove {
+            }
+        }
+
+        /// <summary>
+        /// When a client request is sent for a URL that does not exist, restify will emit this event.
+        /// Note that restify checks for listeners on this event, and if there are none, responds with a default 404 handler.
+        /// It is expected that if you listen for this event, you respond to the client.
+        /// </summary>
+        [ScriptEvent("on", "removeListener")]
+        [ScriptName("NotFound")]
+        public event Action NotFound {
+            add {
+            }
+            remove {
+            }
+        }
+
+        /// <summary>
+        /// Emitted when some handler throws an uncaughtException somewhere in the chain.
+        /// The default behavior is to just call res.send(error), and let the built-ins in restify handle transforming,
+        /// but you can override to whatever you want here.
+        /// </summary>
+        [ScriptEvent("on", "removeListener")]
+        public event Action UncaughtException {
+            add {
+            }
+            remove {
+            }
+        }
+
+        /// <summary>
+        /// When a client request is sent for a route that exist, but has a content-type mismatch, restify will emit this event.
+        /// Note that restify checks for listeners on this event, and if there are none, responds with a default 415 handler.
+        /// It is expected that if you listen for this event, you respond to the client.
+        /// </summary>
+        [ScriptEvent("on", "removeListener")]
+        [ScriptName("UnsupportedMediaType")]
+        public event Action UnsupportedMediaType {
+            add {
+            }
+            remove {
+            }
+        }
+
+        /// <summary>
+        /// When a client request is sent for a route that exists, but does not match the version(s) on those routes,
+        /// restify will emit this event. Note that restify checks for listeners on this event, and if there are none,
+        /// responds with a default 400 handler. It is expected that if you listen for this event, you respond to the client.
+        /// </summary>
+        [ScriptEvent("on", "removeListener")]
+        [ScriptName("VersionNotAllowed")]
+        public event Action VersionNotAllowed {
+            add {
+            }
+            remove {
+            }
+        }
+
+        public RestifyChainedHandler[] AcceptParser(string[] acceptable) {
+            return null;
+        }
+
+        public Dictionary<string, object> Address() {
+            return null;
+        }
+
+        public RestifyChainedHandler[] AuditLogger(object options) {
+            return null;
+        }
+
+        public RestifyChainedHandler[] AuthorizationParser() {
+            return null;
+        }
+
+        public RestifyChainedHandler[] BodyParser() {
+            return null;
+        }
+
+        public void Close(Action callback) {
+        }
+
+        public RestifyChainedHandler[] ConditionalRequest() {
+            return null;
+        }
+        
+        public RestifyServer CreateServer() {
+            return null;
+        }
+
+        public RestifyServer CreateServer(object options) {
+            return null;
+        }
+
+        public RestifyServer CreateServer(RestifyServerOptions options) {
+            return null;
+        }
+        
+        public RestifyChainedHandler[] DateParser() {
+            return null;
+        }
+
+        [ScriptName("del")]
+        public void Delete(string path, RestifyChainedHandler handler) {
+        }
+
+        [ScriptName("del")]
+        public void Delete(string path, RestifyChainedHandler[] handlers) {
+        }
+
+        [ScriptName("del")]
+        public void Delete(RegExp pathPattern, RestifyChainedHandler handler) {
+        }
+
+        [ScriptName("del")]
+        public void Delete(RegExp pathPattern, RestifyChainedHandler[] handlers) {
+        }
+
+        public void Get(string path, RestifyChainedHandler handler) {
+        }
+
+        public void Get(string path, RestifyChainedHandler[] handlers) {
+        }
+
+        public void Get(RestifyServerGetOptions options, RestifyChainedHandler handler) {
+        }
+
+        public void Get(RestifyServerGetOptions options, RestifyChainedHandler[] handlers) {
+        }
+
+        public void Get(RegExp pathPattern, RestifyChainedHandler handler) {
+        }
+
+        public void Get(RegExp pathPattern, RestifyChainedHandler[] handlers) {
+        }
+
+        public void Get(object options, RestifyChainedHandler handler) {
+        }
+
+        public void Get(object options, RestifyChainedHandler[] handlers) {
+        }
+
+        public RestifyChainedHandler[] GzipResponse() {
+            return null;
+        }
+
+        public void Head(string path, RestifyChainedHandler handler) {
+        }
+
+        public void Head(string path, RestifyChainedHandler[] handlers) {
+        }
+
+        public void Head(RegExp pathPattern, RestifyChainedHandler handler) {
+        }
+
+        public void Head(RegExp pathPattern, RestifyChainedHandler[] handlers) {
+        }
+
+        public void Listen(int port, Action callback) {
+        }
+
+        public void Listen(object handle, Action callback) {
+        }
+
+        public void Listen(string path, Action callback) {
+        }
+
+        public void Post(string path, RestifyChainedHandler handler) {
+        }
+
+        public void Post(string path, RestifyChainedHandler[] handlers) {
+        }
+
+        public void Post(RegExp pathPattern, RestifyChainedHandler handler) {
+        }
+
+        public void Post(RegExp pathPattern, RestifyChainedHandler[] handlers) {
+        }
+
+        public void Pre(RestifyChainedHandler handler) {
+        }
+
+        public void Pre(RestifyChainedHandler[] handlers) {
+        }
+
+        public RestifyChainedHandler[] QueryParser() {
+            return null;
+        }
+
+        public RestifyChainedHandler[] RequestLogger() {
+            return null;
+        }
+
+        public RestifyChainedHandler[] RequestLogger(object options) {
+            return null;
+        }
+
+        public RestifyChainedHandler[] ServeStatic(object options) {
+            return null;
+        }
+
+        public RestifyChainedHandler[] Throttle(RestifyThrottleOptions options) {
+            return null;
+        }
+
+        public RestifyChainedHandler[] Throttle(Dictionary<string, object> options) {
+            return null;
+        }
+
+        /// <summary>
+        /// Restify runs handlers in the order they are registered on a server, 
+        /// so if you want some common handlers to run before any of your routes, 
+        /// issue calls to use() before defining routes.
+        /// </summary>
+        public void Use(RestifyChainedHandler handlers) {
+        }
+
+        public void Use(RestifyChainedHandler[] handlers) {
+        }
+    }
+}
diff --git a/src/Libraries/Node/Node.Restify/RestifyServerGetOptions.cs b/src/Libraries/Node/Node.Restify/RestifyServerGetOptions.cs
new file mode 100644
index 000000000..70f4edbf2
--- /dev/null
+++ b/src/Libraries/Node/Node.Restify/RestifyServerGetOptions.cs
@@ -0,0 +1,26 @@
+// RestifyServerGetOptions.cs
+// Script#/Libraries/Node/Restify
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace NodeApi.Restify {
+
+    [ScriptImport]
+    [ScriptIgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class RestifyServerGetOptions {
+
+        public RestifyServerGetOptions() {
+        }
+
+        public RestifyServerGetOptions(params object[] nameValuePairs) {
+        }
+
+        public string Path;
+        
+        public string Version;
+    }
+}
diff --git a/src/Libraries/Node/Node.Restify/RestifyServerOptions.cs b/src/Libraries/Node/Node.Restify/RestifyServerOptions.cs
new file mode 100644
index 000000000..e25086916
--- /dev/null
+++ b/src/Libraries/Node/Node.Restify/RestifyServerOptions.cs
@@ -0,0 +1,79 @@
+// RestifyServerOptions.cs
+// Script#/Libraries/Node/Restify
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace NodeApi.Restify {
+
+    [ScriptIgnoreNamespace]
+    [ScriptImport]
+    [ScriptName("Object")]
+    public sealed class RestifyServerOptions {
+
+        public RestifyServerOptions() {
+        }
+
+        public RestifyServerOptions(params object[] nameValuePairs) {
+        }
+
+        /// <summary>
+        /// If you want to create an HTTPS server, pass in the PEM-encoded certificate and key
+        /// </summary>
+        public string Certificate;
+
+        /// <summary>
+        /// Custom response formatters for res.send()
+        /// </summary>
+        public object Formatters;
+
+        /// <summary>
+        /// If you want to create an HTTPS server, pass in the PEM-encoded certificate and key
+        /// </summary>
+        public string Key;
+
+        /// <summary>
+        /// You can optionally pass in a bunyan (https://github.com/trentm/node-bunyan) instance; not required
+        /// </summary>
+        public object Log;
+
+        /// <summary>
+        /// By default, this will be set in the Server response header, default is restify
+        /// </summary>
+        public string Name;
+
+        /// <summary>
+        /// Any options accepted by node-spdy (https://github.com/indutny/node-spdy)
+        /// </summary>
+        public string Spdy;
+
+        /// <summary>
+        /// Allows you to apply formatting to the value of the header. 
+        /// The duration is passed as an argument in number of milliseconds to execute.
+        /// </summary>
+        /// 
+        /// <example>
+        ///     app = module.exports = restify.createServer({
+        ///             name: 'restify',
+        ///             version: '1.0.0',
+        ///             responseTimeHeader: 'X-Runtime',
+        ///             responseTimeFormatter: function(durationInMilliseconds) {
+        ///             return durationInMilliseconds / 1000;
+        ///         }
+        ///     });
+        /// </example>
+        public Func<int, string> ResponseTimeFormatter;
+
+        /// <summary>
+        /// By default, this will be X-Response-Time
+        /// </summary>
+        public string ResponseTimeHeader;
+
+        /// <summary>
+        /// A default version to set for all routes
+        /// </summary>
+        public string Version;
+    }
+}
diff --git a/src/Libraries/Node/Node.Restify/RestifyStringClient.cs b/src/Libraries/Node/Node.Restify/RestifyStringClient.cs
new file mode 100644
index 000000000..94c687b64
--- /dev/null
+++ b/src/Libraries/Node/Node.Restify/RestifyStringClient.cs
@@ -0,0 +1,57 @@
+// RestifyStringClient.cs
+// Script#/Libraries/Node/Restify
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Runtime.CompilerServices;
+
+namespace NodeApi.Restify {
+
+    [ScriptImport]
+    [ScriptIgnoreNamespace]
+    public class RestifyStringClient {
+
+        protected RestifyStringClient() {
+        }
+
+        public void BasicAuth(string login, string password) {
+        }
+
+         /// <summary>
+        /// del doesn't take content, since you know, it should't:
+        /// </summary>
+        public void Del(string path, object content, RestifyCallback callback) {
+        }
+        
+        /// <summary>
+        /// Performs an HTTP get; if no payload was returned, obj defaults to {} for you (so you don't get a bunch of null pointer errors).
+        /// </summary>
+        /// <param name="path"></param>
+        /// <param name="callback"></param>
+        public void Get(string path, RestifyCallback callback) {
+        }
+
+        /// <summary>
+        /// Just like get, but without obj:
+        /// </summary>
+        /// <param name="path"></param>
+        /// <param name="callback"></param>
+        public void Head(string path, RestifyCallback callback) {
+        }
+
+        /// <summary>
+        /// Takes a complete object to serialize and send to the server.
+        /// </summary>
+        /// <param name="path"></param>
+        /// <param name="content"></param>
+        /// <param name="callback"></param>
+        public void Post(string path, object content, RestifyCallback callback) {
+        }
+
+        /// <summary>
+        /// Just like post:
+        /// </summary>
+        public void Put(string path, object content, RestifyCallback callback) {
+        }
+    }
+}
diff --git a/src/Libraries/Node/Node.Restify/RestifyThrottleOptions.cs b/src/Libraries/Node/Node.Restify/RestifyThrottleOptions.cs
new file mode 100644
index 000000000..5d312cb7c
--- /dev/null
+++ b/src/Libraries/Node/Node.Restify/RestifyThrottleOptions.cs
@@ -0,0 +1,91 @@
+// RestifyThrottleOptions.cs
+// Script#/Libraries/Node/Restify
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace NodeApi.Restify {
+
+    [ScriptIgnoreNamespace]
+    [ScriptImport]
+    [ScriptName("Object")]
+    public sealed class RestifyThrottleOptions {
+
+        public RestifyThrottleOptions() {
+        }
+
+        public RestifyThrottleOptions(params object[] nameValuePairs) {
+        }
+
+        /// <summary>
+        /// If available, the amount of requests to burst to
+        /// </summary>
+        [ScriptField]
+        public int Burst {
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Do throttling on a /32 (source IP)
+        /// </summary>
+        [ScriptField]
+        public bool Ip {
+            set {
+            }
+        }
+
+        /// <summary>
+        /// If using the built-in storage table, the maximum distinct throttling keys to allow at a time
+        /// </summary>
+        [ScriptField]
+        public int MaxKeys {
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Per "key" overrides
+        /// </summary>
+        [ScriptField]
+        public object Overrides {
+            set {
+            }
+        }
+
+        [ScriptField]
+        public int Rate {
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Storage engine; must support put/get
+        /// </summary>
+        [ScriptField]
+        public object TokensTable {
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Do throttling on req.username
+        /// </summary>
+        [ScriptField]
+        public bool Username {
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Do throttling on a /32 (X-Forwarded-For)
+        /// </summary>
+        [ScriptField]
+        public bool Xff {
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/Web/Html/Data/Files/Blob.cs b/src/Libraries/Web/Html/Data/Files/Blob.cs
new file mode 100644
index 000000000..36fa5ed9d
--- /dev/null
+++ b/src/Libraries/Web/Html/Data/Files/Blob.cs
@@ -0,0 +1,54 @@
+// Blob.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.Html.Data.Files {
+
+    [ScriptIgnoreNamespace]
+    [ScriptImport]
+    public class Blob {
+
+        public Blob() {
+        }
+
+        public Blob(object blobParts) {
+        }
+
+        public Blob(object blobParts, object options) {
+        }
+        
+        [CLSCompliant(false)]
+        [ScriptField]
+        public ulong Size {
+            get {
+                return 0;
+            }
+        }
+
+        [ScriptField]
+        public string Type {
+            get {
+                return String.Empty;
+            }
+        }
+
+        public Blob Slice() {
+            return null;
+        }
+
+        public Blob Slice(long start) {
+            return null;
+        }
+
+        public Blob Slice(long start, long end) {
+            return null;
+        }
+
+        public Blob Slice(long start, long end, string contentType) {
+            return null;
+        }
+    }
+}
diff --git a/src/Libraries/Web/Html/Data/Files/File.cs b/src/Libraries/Web/Html/Data/Files/File.cs
new file mode 100644
index 000000000..2814a2da2
--- /dev/null
+++ b/src/Libraries/Web/Html/Data/Files/File.cs
@@ -0,0 +1,31 @@
+// File.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.Html.Data.Files {
+
+    [ScriptIgnoreNamespace]
+    [ScriptImport]
+    public sealed class File : Blob {
+
+        private File() {
+        }
+
+        [ScriptField]
+        public Date LastModifiedDate {
+            get {
+                return Date.Now;
+            }
+        }
+
+        [ScriptField]
+        public String Name {
+            get {
+                return String.Empty;
+            }
+        }
+    }
+}
diff --git a/src/Libraries/Web/Html/Data/Files/FileError.cs b/src/Libraries/Web/Html/Data/Files/FileError.cs
new file mode 100644
index 000000000..02537c9d3
--- /dev/null
+++ b/src/Libraries/Web/Html/Data/Files/FileError.cs
@@ -0,0 +1,24 @@
+// FileError.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.Html.Data.Files {
+
+    [ScriptIgnoreNamespace]
+    [ScriptImport]
+    public sealed class FileError {
+
+        private FileError() {
+        }
+
+        [ScriptField]
+        public string Name {
+            get {
+                return String.Empty;
+            }
+        }
+    }
+}
diff --git a/src/Libraries/Web/Html/Data/Files/FileList.cs b/src/Libraries/Web/Html/Data/Files/FileList.cs
new file mode 100644
index 000000000..0e0915c49
--- /dev/null
+++ b/src/Libraries/Web/Html/Data/Files/FileList.cs
@@ -0,0 +1,31 @@
+// FileList.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.Html.Data.Files {
+
+    [ScriptIgnoreNamespace]
+    [ScriptImport]
+    public sealed class FileList {
+
+        private FileList() {
+        }
+
+        [ScriptField]
+        public long Length {
+            get {
+                return 0;
+            }
+        }
+
+        [ScriptField]
+        public File this[int index] {
+            get {
+                return null;
+            }
+        }
+    }
+}
diff --git a/src/Libraries/Web/Html/Data/Files/FileProgressEvent.cs b/src/Libraries/Web/Html/Data/Files/FileProgressEvent.cs
new file mode 100644
index 000000000..3a66b2e59
--- /dev/null
+++ b/src/Libraries/Web/Html/Data/Files/FileProgressEvent.cs
@@ -0,0 +1,28 @@
+// FileProgressEvent.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.Html.Data.Files {
+
+    [ScriptIgnoreNamespace]
+    [ScriptImport]
+    public sealed class FileProgressEvent : ElementEvent {
+
+        private FileProgressEvent() {
+        }
+
+        public bool Bubbles;
+        public bool Cancelable;
+        public bool DefaultPrevented;
+        public bool LengthComputable;
+
+        public int EventPhase;
+        public int Loaded;
+        public int Total;
+
+        public object ClipboardData;
+    }
+}
diff --git a/src/Libraries/Web/Html/Data/Files/FileReader.cs b/src/Libraries/Web/Html/Data/Files/FileReader.cs
new file mode 100644
index 000000000..c012d073c
--- /dev/null
+++ b/src/Libraries/Web/Html/Data/Files/FileReader.cs
@@ -0,0 +1,151 @@
+// FileReader.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.Html.Data.Files {
+
+    [ScriptIgnoreNamespace]
+    [ScriptImport]
+    public sealed class FileReader {
+
+        [ScriptField]
+        public FileError Error {
+            get {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Indicates the state of the FileReader. This will be one of the State constants. Read only.
+        /// </summary>
+        [ScriptField]
+        public int ReadyState {
+            get {
+                return (int)FileReadyState.Empty;
+            }
+        }
+
+        // File or Blob data
+        [ScriptField]
+        public object Result {
+            get {
+                return null;
+            }
+        }
+
+        [ScriptName("onabort")]
+        public Action<FileProgressEvent> OnAbort {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [ScriptName("onerror")]
+        public Action<FileProgressEvent> OnError {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [ScriptName("onload")]
+        public Action<FileProgressEvent> OnLoad {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [ScriptName("onloadend")]
+        public Action<FileProgressEvent> OnLoadEnd {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [ScriptName("onloadstart")]
+        public Action<FileProgressEvent> OnLoadStart {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [ScriptName("onprogress")]
+        public Action<FileProgressEvent> OnProgress {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        public void Abort() {
+        }
+
+        /// <summary>
+        /// Adds a listener for the specified event.
+        /// </summary>
+        /// <param name="eventName">The name of the event such as 'load'.</param>
+        /// <param name="listener">The listener to be invoked in response to the event.</param>
+        /// <param name="useCapture">Whether the listener wants to initiate capturing the event.</param>
+        public void AddEventListener(string eventName, ElementEventListener listener, bool useCapture) {
+        }
+
+        /// <summary>
+        ///     Adds a listener for the specified event.
+        /// </summary>
+        /// <param name="eventName">The name of the event such as 'load'.</param>
+        /// <param name="handler">The handler to be invoked in response to the event.</param>
+        /// <param name="useCapture">Whether the handler wants to initiate capturing the event.</param>
+        public void AddEventListener(string eventName, IElementEventHandler handler, bool useCapture) {
+        }
+
+        public bool DispatchEvent(MutableEvent eventObject) {
+            return false;
+        }
+        
+        public void ReadAsArrayBuffer(Blob blob) {
+        }
+
+        public void ReadAsBinaryString(Blob blob) {
+        }
+
+        public void ReadAsDataURL(Blob blob) {
+        }
+
+        public void ReadAsText(Blob blob) {
+        }
+
+        public void ReadAsText(Blob blob, string encoding) {
+        }
+
+        /// <summary>
+        /// Removes a listener for the specified event.
+        /// </summary>
+        /// <param name="eventName">The name of the event such as 'load'.</param>
+        /// <param name="listener">The listener to be invoked in response to the event.</param>
+        /// <param name="useCapture">Whether the listener wants to initiate capturing the event.</param>
+        public void RemoveEventListener(string eventName, ElementEventListener listener, bool useCapture) {
+        }
+
+        /// <summary>
+        /// Removes a listener for the specified event.
+        /// </summary>
+        /// <param name="eventName">The name of the event such as 'load'.</param>
+        /// <param name="handler">The handler to be invoked in response to the event.</param>
+        /// <param name="useCapture">Whether the handler wants to initiate capturing the event.</param>
+        public void RemoveEventListener(string eventName, IElementEventHandler handler, bool useCapture) {
+        }
+    }
+}
diff --git a/src/Libraries/Web/Html/Data/Files/FileReaderSync.cs b/src/Libraries/Web/Html/Data/Files/FileReaderSync.cs
new file mode 100644
index 000000000..51620d6ba
--- /dev/null
+++ b/src/Libraries/Web/Html/Data/Files/FileReaderSync.cs
@@ -0,0 +1,30 @@
+// FileReader.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.Html.Data.Files {
+
+    [ScriptIgnoreNamespace]
+    [ScriptImport]
+    public sealed class FileReaderSync {
+
+        public object ReadAsArrayBuffer(Blob blob) {
+            return null;
+        }
+
+        public string ReadAsDataURL(Blob blob) {
+            return null;
+        }
+
+        public string ReadAsText(Blob blob) {
+            return null;
+        }
+
+        public string ReadAsText(Blob blob, string encoding) {
+            return null;
+        }
+    }
+}
diff --git a/src/Libraries/Web/Html/Data/Files/FileReadyState.cs b/src/Libraries/Web/Html/Data/Files/FileReadyState.cs
new file mode 100644
index 000000000..d8cbf97a1
--- /dev/null
+++ b/src/Libraries/Web/Html/Data/Files/FileReadyState.cs
@@ -0,0 +1,21 @@
+// FileReadyState.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.Html.Data.Files {
+
+    [ScriptIgnoreNamespace]
+    [ScriptImport]
+    [ScriptConstants]
+    public enum FileReadyState {
+
+        Empty = 0,
+
+        Loading = 1,
+
+        Done = 2
+    }
+}
diff --git a/src/Libraries/Web/Html/Data/IndexedDB/DBCursor.cs b/src/Libraries/Web/Html/Data/IndexedDB/DBCursor.cs
new file mode 100644
index 000000000..e42200aa6
--- /dev/null
+++ b/src/Libraries/Web/Html/Data/IndexedDB/DBCursor.cs
@@ -0,0 +1,63 @@
+// DBCursor.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.Data.IndexedDB {
+
+    [ScriptIgnoreNamespace]
+    [ScriptImport]
+    public class DBCursor {
+
+        internal DBCursor() {
+        }
+
+        [ScriptField]
+        public string Direction {
+            get {
+                return null;
+            }
+        }
+
+        [ScriptField]
+        public object Key {
+            get {
+                return null;
+            }
+        }
+
+        [ScriptField]
+        public object PrimaryKey {
+            get {
+                return null;
+            }
+        }
+
+        [ScriptField]
+        public object Source {
+            get {
+                return null;
+            }
+        }
+
+        public void Advance(long count) {
+        }
+
+        public void Continue() {
+        }
+
+        public void Continue(object key) {
+        }
+
+        public DBRequest Delete(object value) {
+            return null;
+        }
+
+        public DBRequest Update(object value) {
+            return null;
+        }
+    }
+}
diff --git a/src/Libraries/Web/Html/Data/IndexedDB/DBCursorWithValue.cs b/src/Libraries/Web/Html/Data/IndexedDB/DBCursorWithValue.cs
new file mode 100644
index 000000000..1f7620c7e
--- /dev/null
+++ b/src/Libraries/Web/Html/Data/IndexedDB/DBCursorWithValue.cs
@@ -0,0 +1,25 @@
+// DBCursorWithValue.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.Data.IndexedDB {
+
+    [ScriptIgnoreNamespace]
+    [ScriptImport]
+    public sealed class DBCursorWithValue : DBCursor {
+
+        private DBCursorWithValue() {
+        }
+
+        [ScriptField]
+        public object Value {
+            get {
+                return null;
+            }
+        }
+    }
+}
diff --git a/src/Libraries/Web/Html/Data/IndexedDB/DBDatabase.cs b/src/Libraries/Web/Html/Data/IndexedDB/DBDatabase.cs
new file mode 100644
index 000000000..bbdd4bcb9
--- /dev/null
+++ b/src/Libraries/Web/Html/Data/IndexedDB/DBDatabase.cs
@@ -0,0 +1,99 @@
+// DBDatabase.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.Data.IndexedDB {
+
+    [ScriptIgnoreNamespace]
+    [ScriptImport]
+    public sealed class DBDatabase : DBEventTarget {
+
+        private DBDatabase() {
+        }
+
+        [ScriptField]
+        public string Name {
+            get {
+                return default(string);
+            }
+        }
+
+        [ScriptField]
+        public string[] ObjectStoreNames {
+            get {
+                return default(string[]);
+            }
+        }
+
+        [ScriptName("onabort")]
+        [ScriptField]
+        public DBDatabaseCallback OnAbort {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [ScriptName("onerror")]
+        [ScriptField]
+        public DBDatabaseCallback OnError {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [ScriptName("onversionchange")]
+        [ScriptField]
+        public DBDatabaseVersionChangeCallback OnVersionChange {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [ScriptField]
+        public long Version {
+            get {
+                return default(long);
+            }
+        }
+
+        public void Close() {
+        }
+
+        public DBObjectStore CreateObjectStore(string name) {
+            return default(DBObjectStore);
+        }
+
+        public DBObjectStore CreateObjectStore(string name, DBObjectStoreParameters optionalParameters) {
+            return default(DBObjectStore);
+        }
+
+        public void DeleteObjectStore(string name) {
+        }
+
+        public DBTransaction Transaction(string[] storenames) {
+            return default(DBTransaction);
+        }
+
+        public DBTransaction Transaction(string[] storenames, string mode) {
+            return default(DBTransaction);
+        }
+    }
+
+    [ScriptIgnoreNamespace]
+    [ScriptImport]
+    public delegate void DBDatabaseCallback(DBEvent<DBDatabase> e);
+
+    [ScriptIgnoreNamespace]
+    [ScriptImport]
+    public delegate void DBDatabaseVersionChangeCallback(DBVersionChangeEvent<DBDatabase> e);
+}
diff --git a/src/Libraries/Web/Html/Data/IndexedDB/DBEvent.cs b/src/Libraries/Web/Html/Data/IndexedDB/DBEvent.cs
new file mode 100644
index 000000000..f329cba0d
--- /dev/null
+++ b/src/Libraries/Web/Html/Data/IndexedDB/DBEvent.cs
@@ -0,0 +1,32 @@
+// DBEvent.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.Data.IndexedDB {
+
+    [ScriptIgnoreNamespace]
+    [ScriptImport]
+    public class DBEvent<T> {
+
+        internal DBEvent() {
+        }
+
+        [ScriptField]
+        public T Target {
+            get {
+                return default(T);
+            }
+        }
+
+        [ScriptField]
+        public string Type {
+            get {
+                return null;
+            }
+        }
+    }
+}
diff --git a/src/Libraries/Web/Html/Data/IndexedDB/DBEventTarget.cs b/src/Libraries/Web/Html/Data/IndexedDB/DBEventTarget.cs
new file mode 100644
index 000000000..de2ad05e2
--- /dev/null
+++ b/src/Libraries/Web/Html/Data/IndexedDB/DBEventTarget.cs
@@ -0,0 +1,30 @@
+// DBEventTarget.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.Data.IndexedDB {
+
+    [ScriptIgnoreNamespace]
+    [ScriptImport]
+    public abstract class DBEventTarget {
+
+        internal DBEventTarget() {
+        }
+
+        public void AddEventListener<T>(string type, Action<T> listener) {
+        }
+
+        public void AddEventListener<T>(string type, Action<T> listener, bool useCapture) {
+        }
+
+        public void RemoveEventListener<T>(string type, Action<T> listener) {
+        }
+
+        public void RemoveEventListener<T>(string type, Action<T> listener, bool useCapture) {
+        }
+    }
+}
diff --git a/src/Libraries/Web/Html/Data/IndexedDB/DBFactory.cs b/src/Libraries/Web/Html/Data/IndexedDB/DBFactory.cs
new file mode 100644
index 000000000..84ce1c6f3
--- /dev/null
+++ b/src/Libraries/Web/Html/Data/IndexedDB/DBFactory.cs
@@ -0,0 +1,35 @@
+// DBFactory.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.Data.IndexedDB {
+
+    [ScriptIgnoreNamespace]
+    [ScriptImport]
+    public sealed class DBFactory {
+
+        private DBFactory() {
+        }
+
+        [ScriptName("cmp")]
+        public int Compare(object first, object last) {
+            return default(short);
+        }
+
+        public DBOpenDBRequest DeleteDatabase(string name) {
+            return null;
+        }
+
+        public DBOpenDBRequest Open(string name) {
+            return null;
+        }
+
+        public DBOpenDBRequest Open(string name, long version) {
+            return null;
+        }
+    }
+}
diff --git a/src/Libraries/Web/Html/Data/IndexedDB/DBIndex.cs b/src/Libraries/Web/Html/Data/IndexedDB/DBIndex.cs
new file mode 100644
index 000000000..f26854ce5
--- /dev/null
+++ b/src/Libraries/Web/Html/Data/IndexedDB/DBIndex.cs
@@ -0,0 +1,93 @@
+// DBIndex.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.Data.IndexedDB {
+
+    [ScriptIgnoreNamespace]
+    [ScriptImport]
+    public sealed class DBIndex {
+
+        private DBIndex() {
+        }
+
+        [ScriptField]
+        public string KeyPath {
+            get {
+                return default(string);
+            }
+        }
+
+        [ScriptField]
+        public bool MultiEntry {
+            get {
+                return default(bool);
+            }
+        }
+
+        [ScriptField]
+        public string Name {
+            get {
+                return default(string);
+            }
+        }
+
+        [ScriptField]
+        public DBObjectStore ObjectStore {
+            get {
+                return default(DBObjectStore);
+            }
+        }
+
+        [ScriptField]
+        public bool Unique {
+            get {
+                return default(bool);
+            }
+        }
+
+        public DBRequest Count() {
+            return null;
+        }
+
+        public DBRequest Count(object key) {
+            return null;
+        }
+
+        public DBRequest Get(object key) {
+            return null;
+        }
+
+        public DBRequest GetKey(object key) {
+            return null;
+        }
+
+        public DBRequest OpenCursor() {
+            return null;
+        }
+
+        public DBRequest OpenCursor(object range) {
+            return null;
+        }
+
+        public DBRequest OpenCursor(object range, string direction) {
+            return null;
+        }
+
+        public DBRequest OpenKeyCursor() {
+            return null;
+        }
+
+        public DBRequest OpenKeyCursor(object range) {
+            return null;
+        }
+
+        public DBRequest OpenKeyCursor(object range, string direction) {
+            return null;
+        }
+    }
+}
diff --git a/src/Libraries/Web/Html/Data/IndexedDB/DBIndexParameters.cs b/src/Libraries/Web/Html/Data/IndexedDB/DBIndexParameters.cs
new file mode 100644
index 000000000..799c652ce
--- /dev/null
+++ b/src/Libraries/Web/Html/Data/IndexedDB/DBIndexParameters.cs
@@ -0,0 +1,34 @@
+// DBIndexParameters.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.Data.IndexedDB {
+
+    [ScriptIgnoreNamespace]
+    [ScriptImport]
+    [ScriptName("Object")]
+    public sealed class DBIndexParameters {
+
+        [ScriptField]
+        public bool MultiEntry {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        [ScriptField]
+        public bool Unique {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/Web/Html/Data/IndexedDB/DBObjectStore.cs b/src/Libraries/Web/Html/Data/IndexedDB/DBObjectStore.cs
new file mode 100644
index 000000000..abca44cc5
--- /dev/null
+++ b/src/Libraries/Web/Html/Data/IndexedDB/DBObjectStore.cs
@@ -0,0 +1,116 @@
+// DBObjectStore.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.Data.IndexedDB {
+
+    [ScriptIgnoreNamespace]
+    [ScriptImport]
+    public sealed class DBObjectStore {
+
+        private DBObjectStore() {
+        }
+
+        [ScriptField]
+        public bool AutoIncremenent {
+            get {
+                return default(bool);
+            }
+        }
+
+        [ScriptField]
+        public string[] IndexNames {
+            get {
+                return default(string[]);
+            }
+        }
+
+        [ScriptField]
+        public string KeyPath {
+            get {
+                return default(string);
+            }
+        }
+
+        [ScriptField]
+        public string Name {
+            get {
+                return default(string);
+            }
+        }
+
+        [ScriptField]
+        public DBTransaction Transaction {
+            get {
+                return default(DBTransaction);
+            }
+        }
+
+        public DBRequest Add(object value) {
+            return null;
+        }
+
+        public DBRequest Add(object value, object key) {
+            return null;
+        }
+
+        public DBRequest Clear() {
+            return null;
+        }
+
+        public DBRequest Count() {
+            return null;
+        }
+
+        public DBRequest Count(object key) {
+            return null;
+        }
+
+        public DBIndex CreateIndex(string name, object keyPath) {
+            return default(DBIndex);
+        }
+
+        public DBIndex CreateIndex(string name, object keyPath, DBIndexParameters optionalParameters) {
+            return default(DBIndex);
+        }
+
+        public DBRequest Delete(object key) {
+            return null;
+        }
+
+        public void DeleteIndex(string indexName) {
+        }
+
+        public DBRequest Get(object key) {
+            return null;
+        }
+
+        public DBIndex Index(string name) {
+            return default(DBIndex);
+        }
+
+        public DBRequest OpenCursor() {
+            return null;
+        }
+
+        public DBRequest OpenCursor(object range) {
+            return null;
+        }
+
+        public DBRequest OpenCursor(object range, string direction) {
+            return null;
+        }
+
+        public DBRequest Put(object value) {
+            return null;
+        }
+
+        public DBRequest Put(object value, object key) {
+            return null;
+        }
+    }
+}
diff --git a/src/Libraries/Web/Html/Data/IndexedDB/DBObjectStoreParameters.cs b/src/Libraries/Web/Html/Data/IndexedDB/DBObjectStoreParameters.cs
new file mode 100644
index 000000000..5f5cb5259
--- /dev/null
+++ b/src/Libraries/Web/Html/Data/IndexedDB/DBObjectStoreParameters.cs
@@ -0,0 +1,35 @@
+// DBObjectStoreParameters.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.Data.IndexedDB {
+
+    [ScriptIgnoreNamespace]
+    [ScriptImport]
+    [ScriptName("Object")]
+    public sealed class DBObjectStoreParameters {
+
+        [ScriptField]
+        public bool AutoIncrement {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        [ScriptField]
+        public string KeyPath {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
+
diff --git a/src/Libraries/Web/Html/Data/IndexedDB/DBOpenDBRequest.cs b/src/Libraries/Web/Html/Data/IndexedDB/DBOpenDBRequest.cs
new file mode 100644
index 000000000..6adc6b78b
--- /dev/null
+++ b/src/Libraries/Web/Html/Data/IndexedDB/DBOpenDBRequest.cs
@@ -0,0 +1,46 @@
+// DBOpenDBRequest.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.Data.IndexedDB {
+
+    [ScriptIgnoreNamespace]
+    [ScriptImport]
+    public sealed class DBOpenDBRequest : DBRequest {
+
+        private DBOpenDBRequest() {
+        }
+
+        [ScriptName("onblocked")]
+        [ScriptField]
+        public DBOpenDBRequestCallback OnBlocked {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [ScriptName("onupgradeneeded")]
+        [ScriptField]
+        public DBOpenDBRequestVersionChangeCallback OnUpgradeNeeded {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+
+    [ScriptIgnoreNamespace]
+    [ScriptImport]
+    public delegate void DBOpenDBRequestCallback(DBEvent<DBOpenDBRequest> e);
+
+    [ScriptIgnoreNamespace]
+    [ScriptImport]
+    public delegate void DBOpenDBRequestVersionChangeCallback(DBVersionChangeEvent<DBOpenDBRequest> e);
+}
diff --git a/src/Libraries/Web/Html/Data/IndexedDB/DBRequest.cs b/src/Libraries/Web/Html/Data/IndexedDB/DBRequest.cs
new file mode 100644
index 000000000..0743ee701
--- /dev/null
+++ b/src/Libraries/Web/Html/Data/IndexedDB/DBRequest.cs
@@ -0,0 +1,77 @@
+// DBRequest.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.Data.IndexedDB {
+
+    [ScriptIgnoreNamespace]
+    [ScriptImport]
+    public class DBRequest : DBEventTarget {
+
+        internal DBRequest() {
+        }
+
+        [ScriptField]
+        public object Error {
+            get {
+                return null;
+            }
+        }
+
+        [ScriptName("onerror")]
+        [ScriptField]
+        public DBRequestCallback OnError {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [ScriptName("onsuccess")]
+        [ScriptField]
+        public DBRequestCallback OnSuccess {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [ScriptField]
+        public string ReadyState {
+            get {
+                return null;
+            }
+        }
+
+        [ScriptField]
+        public object Result {
+            get {
+                return null;
+            }
+        }
+
+        [ScriptField]
+        public object Source {
+            get {
+                return null;
+            }
+        }
+
+        [ScriptField]
+        public DBTransaction Transaction {
+            get {
+                return null;
+            }
+        }
+    }
+
+    [ScriptIgnoreNamespace]
+    [ScriptImport]
+    public delegate void DBRequestCallback(DBEvent<DBRequest> e);
+}
diff --git a/src/Libraries/Web/Html/Data/IndexedDB/DBTransaction.cs b/src/Libraries/Web/Html/Data/IndexedDB/DBTransaction.cs
new file mode 100644
index 000000000..5d393bcc6
--- /dev/null
+++ b/src/Libraries/Web/Html/Data/IndexedDB/DBTransaction.cs
@@ -0,0 +1,81 @@
+// DBTransaction.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.Data.IndexedDB {
+
+    [ScriptIgnoreNamespace]
+    [ScriptImport]
+    public sealed class DBTransaction : DBEventTarget {
+
+        private DBTransaction() {
+        }
+
+        [ScriptField]
+        [ScriptName("db")]
+        public DBDatabase Database {
+            get {
+                return null;
+            }
+        }
+
+        [ScriptField]
+        public object Error {
+            get {
+                return null;
+            }
+        }
+
+        [ScriptField]
+        public string Mode {
+            get {
+                return null;
+            }
+        }
+
+        [ScriptName("onabort")]
+        [ScriptField]
+        public DBTransactionCallback OnAbort {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [ScriptName("oncomplete")]
+        [ScriptField]
+        public DBTransactionCallback OnComplete {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [ScriptName("onerror")]
+        [ScriptField]
+        public DBTransactionCallback OnError {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        public void Abort() {
+        }
+
+        public DBObjectStore ObjectStore(string name) {
+            return null;
+        }
+    }
+
+    [ScriptIgnoreNamespace]
+    [ScriptImport]
+    public delegate void DBTransactionCallback(DBEvent<DBTransaction> e);
+}
diff --git a/src/Libraries/Web/Html/Data/IndexedDB/DBVersionChangeEvent.cs b/src/Libraries/Web/Html/Data/IndexedDB/DBVersionChangeEvent.cs
new file mode 100644
index 000000000..2ba7e578f
--- /dev/null
+++ b/src/Libraries/Web/Html/Data/IndexedDB/DBVersionChangeEvent.cs
@@ -0,0 +1,32 @@
+// DBVersionChangeEvent.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.Data.IndexedDB {
+
+    [ScriptIgnoreNamespace]
+    [ScriptImport]
+    public sealed class DBVersionChangeEvent<T> : DBEvent<T> {
+
+        private DBVersionChangeEvent() {
+        }
+
+        [ScriptField]
+        public long NewVersion {
+            get {
+                return default(long);
+            }
+        }
+
+        [ScriptField]
+        public long OldVersion {
+            get {
+                return default(long);
+            }
+        }
+    }
+}
diff --git a/src/Libraries/Web/Html/Data/SqlDatabase.cs b/src/Libraries/Web/Html/Data/Sql/SqlDatabase.cs
similarity index 96%
rename from src/Libraries/Web/Html/Data/SqlDatabase.cs
rename to src/Libraries/Web/Html/Data/Sql/SqlDatabase.cs
index 9e6ca8981..c5c57b276 100644
--- a/src/Libraries/Web/Html/Data/SqlDatabase.cs
+++ b/src/Libraries/Web/Html/Data/Sql/SqlDatabase.cs
@@ -6,9 +6,7 @@
 using System;
 using System.Runtime.CompilerServices;
 
-namespace System.Html.Data {
-
-    public delegate bool SqlDatabaseCallback(SqlDatabase db);
+namespace System.Html.Data.Sql {
 
     [ScriptIgnoreNamespace]
     [ScriptImport]
@@ -33,4 +31,6 @@ public void ReadTransaction(SqlTransactionCallback callback, SqlErrorCallback er
         public void Transaction(SqlTransactionCallback callback, SqlErrorCallback errorCallback, Action successCallback) {
         }
     }
+
+    public delegate bool SqlDatabaseCallback(SqlDatabase db);
 }
diff --git a/src/Libraries/Web/Html/Data/SqlError.cs b/src/Libraries/Web/Html/Data/Sql/SqlError.cs
similarity index 94%
rename from src/Libraries/Web/Html/Data/SqlError.cs
rename to src/Libraries/Web/Html/Data/Sql/SqlError.cs
index a04259a21..88ecef06d 100644
--- a/src/Libraries/Web/Html/Data/SqlError.cs
+++ b/src/Libraries/Web/Html/Data/Sql/SqlError.cs
@@ -6,9 +6,7 @@
 using System;
 using System.Runtime.CompilerServices;
 
-namespace System.Html.Data {
-
-    public delegate bool SqlErrorCallback(SqlError error);
+namespace System.Html.Data.Sql {
 
     [ScriptIgnoreNamespace]
     [ScriptImport]
@@ -31,4 +29,6 @@ public string Message {
             }
         }
     }
+
+    public delegate bool SqlErrorCallback(SqlError error);
 }
diff --git a/src/Libraries/Web/Html/Data/SqlResultSet.cs b/src/Libraries/Web/Html/Data/Sql/SqlResultSet.cs
similarity index 95%
rename from src/Libraries/Web/Html/Data/SqlResultSet.cs
rename to src/Libraries/Web/Html/Data/Sql/SqlResultSet.cs
index 12c40ee59..c4e713c87 100644
--- a/src/Libraries/Web/Html/Data/SqlResultSet.cs
+++ b/src/Libraries/Web/Html/Data/Sql/SqlResultSet.cs
@@ -7,7 +7,7 @@
 using System.Runtime.CompilerServices;
 using System.Collections;
 
-namespace System.Html.Data {
+namespace System.Html.Data.Sql {
 
     [ScriptIgnoreNamespace]
     [ScriptImport]
diff --git a/src/Libraries/Web/Html/Data/SqlResultSetRow.cs b/src/Libraries/Web/Html/Data/Sql/SqlResultSetRow.cs
similarity index 93%
rename from src/Libraries/Web/Html/Data/SqlResultSetRow.cs
rename to src/Libraries/Web/Html/Data/Sql/SqlResultSetRow.cs
index 25de3ea63..dff90378c 100644
--- a/src/Libraries/Web/Html/Data/SqlResultSetRow.cs
+++ b/src/Libraries/Web/Html/Data/Sql/SqlResultSetRow.cs
@@ -7,7 +7,7 @@
 using System.Runtime.CompilerServices;
 using System.Collections;
 
-namespace System.Html.Data {
+namespace System.Html.Data.Sql {
 
     [ScriptIgnoreNamespace]
     [ScriptImport]
diff --git a/src/Libraries/Web/Html/Data/SqlResultSetRowList.cs b/src/Libraries/Web/Html/Data/Sql/SqlResultSetRowList.cs
similarity index 94%
rename from src/Libraries/Web/Html/Data/SqlResultSetRowList.cs
rename to src/Libraries/Web/Html/Data/Sql/SqlResultSetRowList.cs
index 7ca197739..017d4d11a 100644
--- a/src/Libraries/Web/Html/Data/SqlResultSetRowList.cs
+++ b/src/Libraries/Web/Html/Data/Sql/SqlResultSetRowList.cs
@@ -7,7 +7,7 @@
 using System.Runtime.CompilerServices;
 using System.Collections;
 
-namespace System.Html.Data {
+namespace System.Html.Data.Sql {
 
     [ScriptIgnoreNamespace]
     [ScriptImport]
diff --git a/src/Libraries/Web/Html/Data/SqlTransaction.cs b/src/Libraries/Web/Html/Data/Sql/SqlTransaction.cs
similarity index 95%
rename from src/Libraries/Web/Html/Data/SqlTransaction.cs
rename to src/Libraries/Web/Html/Data/Sql/SqlTransaction.cs
index 9b21e9210..ebbb66240 100644
--- a/src/Libraries/Web/Html/Data/SqlTransaction.cs
+++ b/src/Libraries/Web/Html/Data/Sql/SqlTransaction.cs
@@ -6,13 +6,7 @@
 using System;
 using System.Runtime.CompilerServices;
 
-namespace System.Html.Data {
-
-    public delegate bool SqlTransactionCallback(SqlTransaction transaction);
-
-    public delegate bool SqlStatementCallback(SqlTransaction transaction, SqlResultSet resultSet);
-
-    public delegate bool SqlStatementErrorCallback(SqlTransaction transaction, SqlError error);
+namespace System.Html.Data.Sql {
 
     [ScriptIgnoreNamespace]
     [ScriptImport]
@@ -24,4 +18,10 @@ private SqlTransaction() {
         public void ExecuteSql(string sql, object[] arguments, SqlStatementCallback callback, SqlStatementErrorCallback errorCallback) {
         }
     }
+
+    public delegate bool SqlTransactionCallback(SqlTransaction transaction);
+
+    public delegate bool SqlStatementCallback(SqlTransaction transaction, SqlResultSet resultSet);
+
+    public delegate bool SqlStatementErrorCallback(SqlTransaction transaction, SqlError error);
 }
diff --git a/src/Libraries/Web/Html/Document.cs b/src/Libraries/Web/Html/Document.cs
index 43c8cbe93..957266017 100644
--- a/src/Libraries/Web/Html/Document.cs
+++ b/src/Libraries/Web/Html/Document.cs
@@ -5,6 +5,7 @@
 
 using System;
 using System.Runtime.CompilerServices;
+using System.Html.StyleSheets;
 using System.Html.Editing;
 
 namespace System.Html {
@@ -89,7 +90,7 @@ public static string ReadyState {
                 return null;
             }
         }
-        
+
         [ScriptField]
         public static string Referrer {
             get {
@@ -104,6 +105,13 @@ public static Selection Selection {
             }
         }
 
+        [ScriptField]
+        public static StyleSheetList StyleSheets {
+            get {
+                return null;
+            }
+        }
+
         [ScriptField]
         public static string Title {
             get {
@@ -140,18 +148,53 @@ public static void AddEventListener(string eventName, ElementEventListener liste
         public static void AttachEvent(string eventName, ElementEventHandler handler) {
         }
 
+        /// <summary>
+        /// Creates an Attr of the given name. Note that the Attr instance can then be set on an 
+        /// Element using the setAttributeNode method. To create an attribute with a qualified name 
+        /// and namespace URI, use the CreateAttributeNS method.
+        /// </summary>
+        /// <param name="name">The name of the attribute.</param>
+        /// <returns>A new Attr object with the nodeName attribute set to name, and localName, prefix, 
+        /// and namespaceURI set to null. The value of the attribute is the empty string.</returns>
         public static ElementAttribute CreateAttribute(string name) {
             return null;
         }
 
+        /// <summary>
+        /// Creates an attribute of the given qualified name and namespace URI.
+        /// </summary>
+        /// <param name="namespaceURI">The namespace URI of the attribute to create.</param>
+        /// <param name="qualifiedName">The qualified name of the attribute to instantiate.</param>
+        /// <returns>A new Attr object with the given namespace and qualified name.</returns>
+        public static ElementAttribute CreateAttributeNS(string namespaceURI, string qualifiedName) {
+            return null;
+        }
+
         public static DocumentFragment CreateDocumentFragment() {
             return null;
         }
 
+        /// <summary>
+        /// Creates an element of the type specified. 
+        /// To create an element with a qualified name and namespace URI, use the CreateElementNS method.
+        /// </summary>
+        /// <param name="tagName">The name of the element type to instantiate.</param>
+        /// <returns>A new Element object with the nodeName attribute set to tagName, and localName, 
+        /// prefix, and namespaceURI set to null.</returns>
         public static Element CreateElement(string tagName) {
             return null;
         }
 
+        /// <summary>
+        /// Creates an element of the given qualified name and namespace URI. 
+        /// </summary>
+        /// <param name="namespaceURI">The namespace URI of the element to create.</param>
+        /// <param name="qualifiedName">The qualified name of the element type to instantiate.</param>
+        /// <returns>A new Element object with the given namespace and qualified name.</returns>
+        public static Element CreateElementNS(string namespaceURI, string qualifiedName) {
+            return null;
+        }
+
         public static MutableEvent CreateEvent(string eventType) {
             return null;
         }
@@ -160,6 +203,10 @@ public static Element CreateTextNode(string data) {
             return null;
         }
 
+        public static Element ImportNode(Element imporedNode, bool deep) {
+            return null;
+        }
+        
         public static void DetachEvent(string eventName, ElementEventHandler handler) {
         }
 
@@ -198,6 +245,16 @@ public static ElementCollection GetElementsByTagName(string tagName) {
             return null;
         }
 
+        /// <summary>
+        /// Returns a NodeList of all the Elements with a given local name and namespace URI in the order in which they are encountered in a preorder traversal of the Document tree.
+        /// </summary>
+        /// <param name="namespaceURI">The namespace URI of the elements to match on. The special value "*" matches all namespaces.</param>
+        /// <param name="localName">The local name of the elements to match on. The special value "*" matches all local names.</param>
+        /// <returns>A new NodeList object containing all the matched Elements.</returns>
+        public static ElementCollection GetElementsByTagNameNS(string namespaceURI, string localName) {
+            return null;
+        }
+
         public static bool HasFocus() {
             return false;
         }
diff --git a/src/Libraries/Web/Html/ElementEvent.cs b/src/Libraries/Web/Html/ElementEvent.cs
index 68dd09c33..71bcf9384 100644
--- a/src/Libraries/Web/Html/ElementEvent.cs
+++ b/src/Libraries/Web/Html/ElementEvent.cs
@@ -38,6 +38,20 @@ public bool CancelBubble {
             }
         }
 
+        [ScriptField]
+        public int ClientX {
+            get {
+                return 0;
+            }
+        }
+
+        [ScriptField]
+        public int ClientY {
+            get {
+                return 0;
+            }
+        }
+
         [ScriptField]
         public bool CtrlKey {
             get {
@@ -101,6 +115,20 @@ public int OffsetY {
             }
         }
 
+        [ScriptField]
+        public int PageX {
+            get {
+                return 0;
+            }
+        }
+
+        [ScriptField]
+        public int PageY {
+            get {
+                return 0;
+            }
+        }
+
         [ScriptField]
         public bool ReturnValue {
             get {
@@ -110,6 +138,20 @@ public bool ReturnValue {
             }
         }
 
+        [ScriptField]
+        public int ScreenX {
+            get {
+                return 0;
+            }
+        }
+
+        [ScriptField]
+        public int ScreenY {
+            get {
+                return 0;
+            }
+        }
+
         [ScriptField]
         public bool ShiftKey {
             get {
diff --git a/src/Libraries/Web/Html/FileInputElement.cs b/src/Libraries/Web/Html/FileInputElement.cs
new file mode 100644
index 000000000..9ae1a4b1a
--- /dev/null
+++ b/src/Libraries/Web/Html/FileInputElement.cs
@@ -0,0 +1,25 @@
+// FileInputElement.cs
+// Script#/Libraries/Web
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Html.Data.Files;
+using System.Runtime.CompilerServices;
+
+namespace System.Html {
+
+    [ScriptIgnoreNamespace]
+    [ScriptImport]
+    public sealed class FileInputElement : InputElement {
+
+        private FileInputElement() {
+        }
+   
+        [ScriptField]
+        public FileList Files {
+            get {
+                return null;
+            }
+        }
+    }
+}
diff --git a/src/Libraries/Web/Html/LinkElement.cs b/src/Libraries/Web/Html/LinkElement.cs
new file mode 100644
index 000000000..8f6d20d75
--- /dev/null
+++ b/src/Libraries/Web/Html/LinkElement.cs
@@ -0,0 +1,45 @@
+// LinkElement.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 {
+
+    [ScriptIgnoreNamespace]
+    [ScriptImport]
+    public sealed class LinkElement : Element {
+
+        private LinkElement() {
+        }
+
+        [ScriptField]
+        public string Href {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [ScriptField]
+        public string Media {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [ScriptField]
+        public string Rel {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/Web/Html/messageevent.cs b/src/Libraries/Web/Html/MessageEvent.cs
similarity index 100%
rename from src/Libraries/Web/Html/messageevent.cs
rename to src/Libraries/Web/Html/MessageEvent.cs
diff --git a/src/Libraries/Web/Html/StyleSheets/StyleCSSRule.cs b/src/Libraries/Web/Html/StyleSheets/StyleCSSRule.cs
new file mode 100644
index 000000000..70e1a841e
--- /dev/null
+++ b/src/Libraries/Web/Html/StyleSheets/StyleCSSRule.cs
@@ -0,0 +1,34 @@
+// StyleCSSRule.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.StyleSheets {
+
+    [ScriptIgnoreNamespace]
+    [ScriptImport]
+    public sealed class StyleCSSRule : StyleRule {
+
+        private StyleCSSRule() {
+        }
+
+        [ScriptField]
+        public string SelectorText {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [ScriptField]
+        public Style Style {
+            get {
+                return null;
+            }
+        }
+    }
+}
diff --git a/src/Libraries/Web/Html/StyleSheets/StyleCharsetRule.cs b/src/Libraries/Web/Html/StyleSheets/StyleCharsetRule.cs
new file mode 100644
index 000000000..d7a2bf944
--- /dev/null
+++ b/src/Libraries/Web/Html/StyleSheets/StyleCharsetRule.cs
@@ -0,0 +1,27 @@
+// StyleCharsetRule.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.StyleSheets {
+
+    [ScriptIgnoreNamespace]
+    [ScriptImport]
+    public sealed class StyleCharsetRule : StyleRule {
+
+        private StyleCharsetRule() {
+        }
+
+        [ScriptField]
+        public string Encoding {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/Web/Html/StyleSheets/StyleFontFaceRule.cs b/src/Libraries/Web/Html/StyleSheets/StyleFontFaceRule.cs
new file mode 100644
index 000000000..a78dba32e
--- /dev/null
+++ b/src/Libraries/Web/Html/StyleSheets/StyleFontFaceRule.cs
@@ -0,0 +1,25 @@
+// StyleFontFaceRule.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.StyleSheets {
+
+    [ScriptIgnoreNamespace]
+    [ScriptImport]
+    public sealed class StyleFontFaceRule : StyleRule {
+
+        private StyleFontFaceRule() {
+        }
+
+        [ScriptField]
+        public Style Style {
+            get {
+                return null;
+            }
+        }
+    }
+}
diff --git a/src/Libraries/Web/Html/StyleSheets/StyleImportRule.cs b/src/Libraries/Web/Html/StyleSheets/StyleImportRule.cs
new file mode 100644
index 000000000..b3c89b8b9
--- /dev/null
+++ b/src/Libraries/Web/Html/StyleSheets/StyleImportRule.cs
@@ -0,0 +1,39 @@
+// StyleImportRule.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.StyleSheets {
+
+    [ScriptIgnoreNamespace]
+    [ScriptImport]
+    public sealed class StyleImportRule : StyleRule {
+
+        private StyleImportRule() {
+        }
+
+        [ScriptField]
+        public string Href {
+            get {
+                return null;
+            }
+        }
+
+        [ScriptField]
+        public StyleMediaList Media {
+            get {
+                return null;
+            }
+        }
+
+        [ScriptField]
+        public StyleSheet StyleSheet {
+            get {
+                return null;
+            }
+        }
+    }
+}
diff --git a/src/Libraries/Web/Html/StyleSheets/StyleMediaList.cs b/src/Libraries/Web/Html/StyleSheets/StyleMediaList.cs
new file mode 100644
index 000000000..3fb660a0e
--- /dev/null
+++ b/src/Libraries/Web/Html/StyleSheets/StyleMediaList.cs
@@ -0,0 +1,55 @@
+// StyleMediaList.cs
+// Script#/Libraries/Web
+// 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.Html.StyleSheets {
+
+    [ScriptIgnoreNamespace]
+    [ScriptImport]
+    public sealed class StyleMediaList : IEnumerable {
+
+        private StyleMediaList() {
+        }
+
+        [ScriptField]
+        public int Length {
+            get {
+                return 0;
+            }
+        }
+
+        [ScriptField]
+        public string MediaText {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [ScriptField]
+        public string this[int index] {
+            get {
+                return null;
+            }
+        }
+
+        public void AppendMedium(string newMedium) {
+        }
+
+        public void DeleteMedium(string oldMedium) {
+        }
+
+        public static implicit operator string[](StyleMediaList list) {
+            return null;
+        }
+
+        IEnumerator IEnumerable.GetEnumerator() {
+            return null;
+        }
+    }
+}
diff --git a/src/Libraries/Web/Html/StyleSheets/StyleMediaRule.cs b/src/Libraries/Web/Html/StyleSheets/StyleMediaRule.cs
new file mode 100644
index 000000000..ad49c96a5
--- /dev/null
+++ b/src/Libraries/Web/Html/StyleSheets/StyleMediaRule.cs
@@ -0,0 +1,40 @@
+// StyleMediaRule.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.StyleSheets {
+
+    [ScriptIgnoreNamespace]
+    [ScriptImport]
+    public sealed class StyleMediaRule : StyleRule {
+
+        private StyleMediaRule() {
+        }
+
+        [ScriptField]
+        public StyleMediaList Media {
+            get {
+                return null;
+            }
+        }
+
+        [ScriptField]
+        [ScriptName("cssRules")]
+        public StyleRuleList StyleRules {
+            get {
+                return null;
+            }
+        }
+
+        public void DeleteRule(int index) {
+        }
+
+        public int InsertRule(string rule, int index) {
+            return 0;
+        }
+    }
+}
diff --git a/src/Libraries/Web/Html/StyleSheets/StylePageRule.cs b/src/Libraries/Web/Html/StyleSheets/StylePageRule.cs
new file mode 100644
index 000000000..383e966ed
--- /dev/null
+++ b/src/Libraries/Web/Html/StyleSheets/StylePageRule.cs
@@ -0,0 +1,34 @@
+// StylePageRule.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.StyleSheets {
+
+    [ScriptIgnoreNamespace]
+    [ScriptImport]
+    public sealed class StylePageRule : StyleRule {
+
+        private StylePageRule() {
+        }
+
+        [ScriptField]
+        public string SelectorText {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [ScriptField]
+        public Style Style {
+            get {
+                return null;
+            }
+        }
+    }
+}
diff --git a/src/Libraries/Web/Html/StyleSheets/StyleRule.cs b/src/Libraries/Web/Html/StyleSheets/StyleRule.cs
new file mode 100644
index 000000000..20a3e0240
--- /dev/null
+++ b/src/Libraries/Web/Html/StyleSheets/StyleRule.cs
@@ -0,0 +1,49 @@
+// StyleRule.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.StyleSheets {
+
+    [ScriptIgnoreNamespace]
+    [ScriptImport]
+    public abstract class StyleRule {
+
+        internal StyleRule() {
+        }
+
+        [ScriptField]
+        [ScriptName("cssText")]
+        public string CSSText {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [ScriptField]
+        public StyleRule ParentRule {
+            get {
+                return null;
+            }
+        }
+
+        [ScriptField]
+        public StyleSheet ParentStyleSheet {
+            get {
+                return null;
+            }
+        }
+
+        [ScriptField]
+        public StyleRuleType Type {
+            get {
+                return StyleRuleType.Unknown;
+            }
+        }
+    }
+}
diff --git a/src/Libraries/Web/Html/StyleSheets/StyleRuleList.cs b/src/Libraries/Web/Html/StyleSheets/StyleRuleList.cs
new file mode 100644
index 000000000..9193048ae
--- /dev/null
+++ b/src/Libraries/Web/Html/StyleSheets/StyleRuleList.cs
@@ -0,0 +1,40 @@
+// StyleRuleList.cs
+// Script#/Libraries/Web
+// 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.Html.StyleSheets {
+
+    [ScriptIgnoreNamespace]
+    [ScriptImport]
+    public sealed class StyleRuleList : IEnumerable {
+
+        private StyleRuleList() {
+        }
+
+        [ScriptField]
+        public int Length {
+            get {
+                return 0;
+            }
+        }
+
+        [ScriptField]
+        public StyleRule this[int index] {
+            get {
+                return null;
+            }
+        }
+
+        public static implicit operator StyleRule[](StyleRuleList list) {
+            return null;
+        }
+
+        IEnumerator IEnumerable.GetEnumerator() {
+            return null;
+        }
+    }
+}
diff --git a/src/Libraries/Web/Html/StyleSheets/StyleRuleType.cs b/src/Libraries/Web/Html/StyleSheets/StyleRuleType.cs
new file mode 100644
index 000000000..f7c4186b1
--- /dev/null
+++ b/src/Libraries/Web/Html/StyleSheets/StyleRuleType.cs
@@ -0,0 +1,31 @@
+// StyleRule.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.StyleSheets {
+
+    [ScriptIgnoreNamespace]
+    [ScriptImport]
+    [ScriptConstants]
+    public enum StyleRuleType {
+
+        Unknown = 0,
+
+        Style = 1,
+
+        Charset = 2,
+
+        Import = 3,
+
+        Media = 4,
+
+        FontFace = 5,
+
+        Page = 6,
+
+    }
+}
diff --git a/src/Libraries/Web/Html/StyleSheets/StyleSheet.cs b/src/Libraries/Web/Html/StyleSheets/StyleSheet.cs
new file mode 100644
index 000000000..68bff5112
--- /dev/null
+++ b/src/Libraries/Web/Html/StyleSheets/StyleSheet.cs
@@ -0,0 +1,102 @@
+// StyleSheet.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.StyleSheets {
+
+    [ScriptIgnoreNamespace]
+    [ScriptImport]
+    public sealed class StyleSheet {
+
+        private StyleSheet() {
+        }
+
+        [ScriptField]
+        [ScriptName("cssRules")]
+        public StyleRuleList StyleRules {
+            get {
+                return null;
+            }
+        }
+
+        [ScriptField]
+        public bool Disabled {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        [ScriptField]
+        public string Href {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [ScriptField]
+        public string Id {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [ScriptField]
+        public StyleMediaList Media {
+            get {
+                return null;
+            }
+        }
+
+        [ScriptField]
+        public Element OwnerNode {
+            get {
+                return null;
+            }
+        }
+
+        [ScriptField]
+        public StyleRule OwnerRule {
+            get {
+                return null;
+            }
+        }
+
+        [ScriptField]
+        public StyleSheet ParentStyleSheet {
+            get {
+                return null;
+            }
+        }
+
+        [ScriptField]
+        public string Title {
+            get {
+                return null;
+            }
+        }
+
+        [ScriptField]
+        public string Type {
+            get {
+                return null;
+            }
+        }
+
+        public void DeleteRule(int index) {
+        }
+
+        public int InsertRule(string rule, int index) {
+            return 0;
+        }
+    }
+}
diff --git a/src/Libraries/Web/Html/StyleSheets/StyleSheetList.cs b/src/Libraries/Web/Html/StyleSheets/StyleSheetList.cs
new file mode 100644
index 000000000..4286fa8a6
--- /dev/null
+++ b/src/Libraries/Web/Html/StyleSheets/StyleSheetList.cs
@@ -0,0 +1,40 @@
+// StyleSheetList.cs
+// Script#/Libraries/Web
+// 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.Html.StyleSheets {
+
+    [ScriptIgnoreNamespace]
+    [ScriptImport]
+    public sealed class StyleSheetList : IEnumerable {
+
+        private StyleSheetList() {
+        }
+
+        [ScriptField]
+        public int Length {
+            get {
+                return 0;
+            }
+        }
+
+        [ScriptField]
+        public StyleSheet this[int index] {
+            get {
+                return null;
+            }
+        }
+
+        public static implicit operator StyleSheet[](StyleSheetList list) {
+            return null;
+        }
+
+        IEnumerator IEnumerable.GetEnumerator() {
+            return null;
+        }
+    }
+}
diff --git a/src/Libraries/Web/Html/Window.cs b/src/Libraries/Web/Html/Window.cs
index 6362d7af1..6fab1367e 100644
--- a/src/Libraries/Web/Html/Window.cs
+++ b/src/Libraries/Web/Html/Window.cs
@@ -5,6 +5,9 @@
 
 using System;
 using System.Html.Data;
+using System.Html.Data.Files;
+using System.Html.Data.IndexedDB;
+using System.Html.Data.Sql;
 using System.Runtime.CompilerServices;
 
 namespace System.Html {
@@ -28,6 +31,13 @@ public static ApplicationCache ApplicationCache {
             }
         }
 
+        [ScriptField]
+        public static Blob Blob {
+            get {
+                return null;
+            }
+        }
+
         /// <summary>
         /// IE only.
         /// </summary>
@@ -78,6 +88,27 @@ public static ElementEvent Event {
             }
         }
 
+        [ScriptField]
+        public static File File {
+            get {
+                return null;
+            }
+        }
+
+        [ScriptField]
+        public static FileList FileList {
+            get {
+                return null;
+            }
+        }
+
+        [ScriptField]
+        public static FileReader FileReader {
+            get {
+                return null;
+            }
+        }
+
         [ScriptField]
         public static IFrameElement FrameElement {
             get {
@@ -293,6 +324,28 @@ public static void Alert(object o) {
         public static void AttachEvent(string eventName, ElementEventHandler handler) {
         }
 
+        /// <summary>
+        /// Decodes a string of data which has been encoded using base-64 encoding.
+        /// For use with Unicode or UTF-8 strings.
+        /// </summary>
+        /// <param name="base64EncodedData">Base64 encoded string</param>
+        /// <returns>String of Binary data</returns>
+        [ScriptName("atob")]
+        public static string Base64ToBinary(string base64EncodedData) {
+            return null;
+        }
+
+        /// <summary>
+        /// Creates a base-64 encoded ASCII string from a "string" of binary data.
+        /// Please note that this is not suitable for raw Unicode strings!
+        /// </summary>
+        /// <param name="stringToEncode">String of binary data</param>
+        /// <returns>Base64 string</returns>
+        [ScriptName("btoa")]
+        public static string BinaryToBase64(string stringToEncode) {
+            return null;
+        }
+
         public static void Close() {
         }
 
@@ -410,6 +463,14 @@ public static SqlDatabase OpenDatabase(string name, string version, string displ
             return null;
         }
 
+        [ScriptField]
+        public static DBFactory IndexedDB {
+            get {
+                return null;
+            }
+        }
+
+
         public static void PostMessage(string message, string targetOrigin) {
         }
 
diff --git a/src/Libraries/Web/Web.csproj b/src/Libraries/Web/Web.csproj
index 317cb4c29..792b45c68 100644
--- a/src/Libraries/Web/Web.csproj
+++ b/src/Libraries/Web/Web.csproj
@@ -48,7 +48,42 @@
     <Compile Include="Html\CheckBoxElement.cs" />
     <Compile Include="Html\CanvasElement.cs" />
     <Compile Include="Html\ClientRectList.cs" />
+    <Compile Include="Html\LinkElement.cs" />
+    <Compile Include="Html\StyleSheets\StyleRuleType.cs" />
+    <Compile Include="Html\StyleSheets\StylePageRule.cs" />
+    <Compile Include="Html\StyleSheets\StyleCharsetRule.cs" />
+    <Compile Include="Html\StyleSheets\StyleFontFaceRule.cs" />
+    <Compile Include="Html\StyleSheets\StyleMediaRule.cs" />
+    <Compile Include="Html\StyleSheets\StyleImportRule.cs" />
+    <Compile Include="Html\StyleSheets\StyleMediaList.cs" />
+    <Compile Include="Html\StyleSheets\StyleCSSRule.cs" />
+    <Compile Include="Html\StyleSheets\StyleRule.cs" />
+    <Compile Include="Html\StyleSheets\StyleRuleList.cs" />
+    <Compile Include="Html\StyleSheets\StyleSheetList.cs" />
+    <Compile Include="Html\Data\Files\FileReaderSync.cs" />
+    <Compile Include="Html\Data\Files\FileProgressEvent.cs" />
+    <Compile Include="Html\Data\Files\FileError.cs" />
+    <Compile Include="Html\Data\Files\FileReadyState.cs" />
+    <Compile Include="Html\Data\IndexedDB\DBVersionChangeEvent.cs" />
+    <Compile Include="Html\Data\IndexedDB\DBCursor.cs" />
+    <Compile Include="Html\Data\IndexedDB\DBCursorWithValue.cs" />
+    <Compile Include="Html\Data\IndexedDB\DBDatabase.cs" />
+    <Compile Include="Html\Data\IndexedDB\DBEvent.cs" />
+    <Compile Include="Html\Data\IndexedDB\DBEventTarget.cs" />
+    <Compile Include="Html\Data\IndexedDB\DBIndex.cs" />
+    <Compile Include="Html\Data\IndexedDB\DBIndexParameters.cs" />
+    <Compile Include="Html\Data\IndexedDB\DBObjectStore.cs" />
+    <Compile Include="Html\Data\IndexedDB\DBObjectStoreParameters.cs" />
+    <Compile Include="Html\Data\IndexedDB\DBOpenDBRequest.cs" />
+    <Compile Include="Html\Data\IndexedDB\DBRequest.cs" />
+    <Compile Include="Html\Data\IndexedDB\DBFactory.cs" />
+    <Compile Include="Html\Data\IndexedDB\DBTransaction.cs" />
     <Compile Include="Html\ElementEventListener.cs" />
+    <Compile Include="Html\Data\Files\Blob.cs" />
+    <Compile Include="Html\Data\Files\File.cs" />
+    <Compile Include="Html\Data\Files\FileList.cs" />
+    <Compile Include="Html\Data\Files\FileReader.cs" />
+    <Compile Include="Html\FileInputElement.cs" />
     <Compile Include="Html\GestureEvent.cs" />
     <Compile Include="Html\CustomEvent.cs" />
     <Compile Include="Html\Media\Graphics\Rendering.cs" />
@@ -56,18 +91,19 @@
     <Compile Include="Html\ClientRect.cs" />
     <Compile Include="Html\Plugin.cs" />
     <Compile Include="Html\PluginArray.cs" />
+    <Compile Include="Html\StyleSheets\StyleSheet.cs" />
     <Compile Include="Html\TokenList.cs" />
     <Compile Include="Html\TouchInfo.cs" />
     <Compile Include="Html\TouchEvent.cs" />
     <Compile Include="Html\Data\ApplicationCache.cs" />
     <Compile Include="Html\Data\ApplicationCacheStatus.cs" />
     <Compile Include="Html\Data\ApplicationCacheEvent.cs" />
-    <Compile Include="Html\Data\SqlResultSet.cs" />
-    <Compile Include="Html\Data\SqlResultSetRow.cs" />
-    <Compile Include="Html\Data\SqlResultSetRowList.cs" />
-    <Compile Include="Html\Data\SqlError.cs" />
-    <Compile Include="Html\Data\SqlTransaction.cs" />
-    <Compile Include="Html\Data\SqlDatabase.cs" />
+    <Compile Include="Html\Data\Sql\SqlResultSet.cs" />
+    <Compile Include="Html\Data\Sql\SqlResultSetRow.cs" />
+    <Compile Include="Html\Data\Sql\SqlResultSetRowList.cs" />
+    <Compile Include="Html\Data\Sql\SqlError.cs" />
+    <Compile Include="Html\Data\Sql\SqlTransaction.cs" />
+    <Compile Include="Html\Data\Sql\SqlDatabase.cs" />
     <Compile Include="Html\Media\Graphics\Pattern.cs" />
     <Compile Include="Html\Media\Graphics\Gradient.cs" />
     <Compile Include="Html\Orientation.cs" />
@@ -144,6 +180,7 @@
     <Compile Include="..\..\ScriptSharp.cs">
       <Link>Properties\ScriptSharp.cs</Link>
     </Compile>
+    <Compile Include="Xml\XmlSerializer.cs" />
     <Compile Include="Xml\XmlAttribute.cs" />
     <Compile Include="Xml\XmlDocument.cs" />
     <Compile Include="Xml\XmlDocumentParser.cs" />
diff --git a/src/Libraries/Web/Xml/XmlDocument.cs b/src/Libraries/Web/Xml/XmlDocument.cs
index d196825f3..2629072e9 100644
--- a/src/Libraries/Web/Xml/XmlDocument.cs
+++ b/src/Libraries/Web/Xml/XmlDocument.cs
@@ -59,5 +59,9 @@ public XmlNode CreateProcessingInstruction(string target, string data) {
         public XmlText CreateTextNode(string text) {
             return null;
         }
+
+        public XmlNode ImportNode(XmlNode externalNode, bool deep) {
+            return null;
+        }
     }
 }
diff --git a/src/Libraries/Web/Xml/XmlNode.cs b/src/Libraries/Web/Xml/XmlNode.cs
index ed6189b80..e1fb1a90e 100644
--- a/src/Libraries/Web/Xml/XmlNode.cs
+++ b/src/Libraries/Web/Xml/XmlNode.cs
@@ -137,31 +137,31 @@ public XmlNodeList GetElementsByTagName(string tagName) {
             return null;
         }
 
-        public bool HasChildNodes() {
+        public bool HasAttributes() {
             return false;
         }
 
-        public XmlNode InsertBefore(XmlNode child, XmlNode refChild) {
-            return null;
+        public bool HasChildNodes() {
+            return false;
         }
 
-        public XmlNode RemoveChild(XmlNode child) {
+        public XmlNode InsertBefore(XmlNode child, XmlNode refChild) {
             return null;
         }
 
-        public XmlNode ReplaceChild(XmlNode child, XmlNode oldChild) {
+        public XmlNode QuerySelector(string selector) {
             return null;
         }
 
-        public XmlNodeList SelectNodes(string xpath) {
+        public XmlNodeList QuerySelectorAll(string selector) {
             return null;
         }
 
-        public XmlNode SelectSingleNode(string xpath) {
+        public XmlNode RemoveChild(XmlNode child) {
             return null;
         }
 
-        public string TransformNode(XmlDocument stylesheet) {
+        public XmlNode ReplaceChild(XmlNode child, XmlNode oldChild) {
             return null;
         }
     }
diff --git a/src/Libraries/Web/Xml/XmlSerializer.cs b/src/Libraries/Web/Xml/XmlSerializer.cs
new file mode 100644
index 000000000..58e2c8178
--- /dev/null
+++ b/src/Libraries/Web/Xml/XmlSerializer.cs
@@ -0,0 +1,21 @@
+// XmlSerializer.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.Xml {
+
+    [ScriptIgnoreNamespace]
+    [ScriptImport]
+    [ScriptName("XMLSerializer")]
+    public sealed class XmlSerializer {
+
+        [ScriptName("serializeToString")]
+        public string Serialize(XmlDocument xml) {
+            return null;
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.Core/jQueryEvent.cs b/src/Libraries/jQuery/jQuery.Core/jQueryEvent.cs
index 08bd48bf9..ae0d7d431 100644
--- a/src/Libraries/jQuery/jQuery.Core/jQueryEvent.cs
+++ b/src/Libraries/jQuery/jQuery.Core/jQueryEvent.cs
@@ -89,6 +89,13 @@ public Dictionary Data {
             }
         }
 
+        [ScriptField]
+        public bool MetaKey {
+            get {
+                return false;
+            }
+        }
+
         /// <summary>
         /// Gets the namespace specified when the event was triggered.
         /// </summary>
diff --git a/src/Libraries/jQuery/jQuery.Core/jQueryPosition.cs b/src/Libraries/jQuery/jQuery.Core/jQueryPosition.cs
index 7d8a93766..24d084f60 100644
--- a/src/Libraries/jQuery/jQuery.Core/jQueryPosition.cs
+++ b/src/Libraries/jQuery/jQuery.Core/jQueryPosition.cs
@@ -14,9 +14,13 @@ namespace jQueryApi {
     /// </summary>
     [ScriptImport]
     [ScriptIgnoreNamespace]
+    [ScriptName("Object")]
     public sealed class jQueryPosition {
 
-        private jQueryPosition() {
+        public jQueryPosition() {
+        }
+
+        public jQueryPosition(params object[] nameValuePairs) {
         }
 
         /// <summary>
@@ -27,6 +31,8 @@ public int Left {
             get {
                 return 0;
             }
+            set {
+            }
         }
 
         /// <summary>
@@ -37,6 +43,8 @@ public int Top {
             get {
                 return 0;
             }
+            set {
+            }
         }
 
         public static implicit operator Dictionary(jQueryPosition position) {
diff --git a/src/ScriptSharp.sln b/src/ScriptSharp.sln
index 030d92e9b..fef45edef 100644
--- a/src/ScriptSharp.sln
+++ b/src/ScriptSharp.sln
@@ -36,6 +36,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZipX", "ZipX\ZipX.csproj",
 		{9600C55B-E14E-45EA-92C6-F453B19F5D7F} = {9600C55B-E14E-45EA-92C6-F453B19F5D7F}
 		{DCA0235F-88C1-43A0-A8DB-FF765D344E06} = {DCA0235F-88C1-43A0-A8DB-FF765D344E06}
 		{9F14036F-673F-418E-B817-7E2289D7F3F6} = {9F14036F-673F-418E-B817-7E2289D7F3F6}
+		{9D59077D-1A05-4D6C-A1A4-FB748D200578} = {9D59077D-1A05-4D6C-A1A4-FB748D200578}
 		{1772A38C-7204-42DC-B81D-6C74D17A4F66} = {1772A38C-7204-42DC-B81D-6C74D17A4F66}
 		{36D4B098-A21C-4725-ACD3-400922885F38} = {36D4B098-A21C-4725-ACD3-400922885F38}
 		{3681A9A8-FC40-4125-B842-7775713C8DCE} = {3681A9A8-FC40-4125-B842-7775713C8DCE}
@@ -43,8 +44,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZipX", "ZipX\ZipX.csproj",
 		{967A6FD7-E14B-4DB0-81D9-86E0DC12291A} = {967A6FD7-E14B-4DB0-81D9-86E0DC12291A}
 		{4A9F7CE0-5A45-4B28-AD01-05528709B6E4} = {4A9F7CE0-5A45-4B28-AD01-05528709B6E4}
 		{4A9F7CE9-5A45-4B28-AD01-05528709B6E4} = {4A9F7CE9-5A45-4B28-AD01-05528709B6E4}
+		{4A9F7CE9-5B45-4B28-AD01-05528709B6E4} = {4A9F7CE9-5B45-4B28-AD01-05528709B6E4}
+		{4A9F7CE9-5B45-4B28-AD01-05529709B6E4} = {4A9F7CE9-5B45-4B28-AD01-05529709B6E4}
 		{824C1FEC-2455-4183-AFC6-891EDB88213A} = {824C1FEC-2455-4183-AFC6-891EDB88213A}
 		{2E5D9DFC-97BD-4652-B09A-B88E6ECDEF43} = {2E5D9DFC-97BD-4652-B09A-B88E6ECDEF43}
+		{232445FF-22AA-46F7-BA12-4590C670F2B1} = {232445FF-22AA-46F7-BA12-4590C670F2B1}
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "jQuery.Validation", "Libraries\jQuery\jQuery.Validation\jQuery.Validation.csproj", "{967A6FD7-E14B-4DB0-81D9-86E0DC12291A}"
@@ -65,6 +69,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Node.Express", "Libraries\N
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Node.Mongo", "Libraries\Node\Node.Mongo\Node.Mongo.csproj", "{4A9F7CE9-5B45-4B28-AD01-05529709B6E4}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Node.Neo4j", "Libraries\Node\Node.Neo4j\Node.Neo4j.csproj", "{232445FF-22AA-46F7-BA12-4590C670F2B1}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deployment", "Tools\Deployment\Deployment.csproj", "{9D59077D-1A05-4D6C-A1A4-FB748D200578}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Node.Restify", "Libraries\Node\Node.Restify\Node.Restify.csproj", "{1ECC689C-2542-4EE8-8A86-7627E63F44F8}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Node.Azure", "Libraries\Node\Node.Azure\Node.Azure.csproj", "{4A9F7CE9-5B55-4B28-AD01-05528709B6E4}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|.NET = Debug|.NET
@@ -304,6 +316,54 @@ Global
 		{4A9F7CE9-5B45-4B28-AD01-05529709B6E4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{4A9F7CE9-5B45-4B28-AD01-05529709B6E4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{4A9F7CE9-5B45-4B28-AD01-05529709B6E4}.Release|x86.ActiveCfg = Release|Any CPU
+		{232445FF-22AA-46F7-BA12-4590C670F2B1}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{232445FF-22AA-46F7-BA12-4590C670F2B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{232445FF-22AA-46F7-BA12-4590C670F2B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{232445FF-22AA-46F7-BA12-4590C670F2B1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{232445FF-22AA-46F7-BA12-4590C670F2B1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{232445FF-22AA-46F7-BA12-4590C670F2B1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{232445FF-22AA-46F7-BA12-4590C670F2B1}.Release|.NET.ActiveCfg = Release|Any CPU
+		{232445FF-22AA-46F7-BA12-4590C670F2B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{232445FF-22AA-46F7-BA12-4590C670F2B1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{232445FF-22AA-46F7-BA12-4590C670F2B1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{232445FF-22AA-46F7-BA12-4590C670F2B1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{232445FF-22AA-46F7-BA12-4590C670F2B1}.Release|x86.ActiveCfg = Release|Any CPU
+		{9D59077D-1A05-4D6C-A1A4-FB748D200578}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{9D59077D-1A05-4D6C-A1A4-FB748D200578}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9D59077D-1A05-4D6C-A1A4-FB748D200578}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9D59077D-1A05-4D6C-A1A4-FB748D200578}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9D59077D-1A05-4D6C-A1A4-FB748D200578}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9D59077D-1A05-4D6C-A1A4-FB748D200578}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9D59077D-1A05-4D6C-A1A4-FB748D200578}.Release|.NET.ActiveCfg = Release|Any CPU
+		{9D59077D-1A05-4D6C-A1A4-FB748D200578}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9D59077D-1A05-4D6C-A1A4-FB748D200578}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9D59077D-1A05-4D6C-A1A4-FB748D200578}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{9D59077D-1A05-4D6C-A1A4-FB748D200578}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{9D59077D-1A05-4D6C-A1A4-FB748D200578}.Release|x86.ActiveCfg = Release|Any CPU
+		{1ECC689C-2542-4EE8-8A86-7627E63F44F8}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{1ECC689C-2542-4EE8-8A86-7627E63F44F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1ECC689C-2542-4EE8-8A86-7627E63F44F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1ECC689C-2542-4EE8-8A86-7627E63F44F8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1ECC689C-2542-4EE8-8A86-7627E63F44F8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1ECC689C-2542-4EE8-8A86-7627E63F44F8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1ECC689C-2542-4EE8-8A86-7627E63F44F8}.Release|.NET.ActiveCfg = Release|Any CPU
+		{1ECC689C-2542-4EE8-8A86-7627E63F44F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1ECC689C-2542-4EE8-8A86-7627E63F44F8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1ECC689C-2542-4EE8-8A86-7627E63F44F8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{1ECC689C-2542-4EE8-8A86-7627E63F44F8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{1ECC689C-2542-4EE8-8A86-7627E63F44F8}.Release|x86.ActiveCfg = Release|Any CPU
+		{4A9F7CE9-5B55-4B28-AD01-05528709B6E4}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{4A9F7CE9-5B55-4B28-AD01-05528709B6E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4A9F7CE9-5B55-4B28-AD01-05528709B6E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4A9F7CE9-5B55-4B28-AD01-05528709B6E4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4A9F7CE9-5B55-4B28-AD01-05528709B6E4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4A9F7CE9-5B55-4B28-AD01-05528709B6E4}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4A9F7CE9-5B55-4B28-AD01-05528709B6E4}.Release|.NET.ActiveCfg = Release|Any CPU
+		{4A9F7CE9-5B55-4B28-AD01-05528709B6E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4A9F7CE9-5B55-4B28-AD01-05528709B6E4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4A9F7CE9-5B55-4B28-AD01-05528709B6E4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{4A9F7CE9-5B55-4B28-AD01-05528709B6E4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{4A9F7CE9-5B55-4B28-AD01-05528709B6E4}.Release|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -320,6 +380,9 @@ Global
 		{4A9F7CE9-5A45-4B28-AD01-05528709B6E4} = {5D0FD0F6-498E-4126-A297-97B7763DD0AB}
 		{4A9F7CE9-5B45-4B28-AD01-05528709B6E4} = {5D0FD0F6-498E-4126-A297-97B7763DD0AB}
 		{4A9F7CE9-5B45-4B28-AD01-05529709B6E4} = {5D0FD0F6-498E-4126-A297-97B7763DD0AB}
+		{232445FF-22AA-46F7-BA12-4590C670F2B1} = {5D0FD0F6-498E-4126-A297-97B7763DD0AB}
+		{1ECC689C-2542-4EE8-8A86-7627E63F44F8} = {5D0FD0F6-498E-4126-A297-97B7763DD0AB}
+		{4A9F7CE9-5B55-4B28-AD01-05528709B6E4} = {5D0FD0F6-498E-4126-A297-97B7763DD0AB}
 		{1772A38C-7204-42DC-B81D-6C74D17A4F66} = {D1DF352A-45B6-4130-9A8B-A24C20257B7D}
 		{BE1E0A21-F6C0-4698-B405-66FC2BB289F4} = {D1DF352A-45B6-4130-9A8B-A24C20257B7D}
 		{36D4B098-A21C-4725-ACD3-400922885F38} = {D1DF352A-45B6-4130-9A8B-A24C20257B7D}
@@ -327,6 +390,7 @@ Global
 		{8780581F-7C26-4B64-9236-BA1C458DF36E} = {D1DF352A-45B6-4130-9A8B-A24C20257B7D}
 		{31456150-1093-407F-9231-58D0F663945D} = {37239BB8-2FA4-4831-A7EA-AF89D74EA10E}
 		{B87E403B-354D-47A1-9876-14C618A80A41} = {37239BB8-2FA4-4831-A7EA-AF89D74EA10E}
+		{9D59077D-1A05-4D6C-A1A4-FB748D200578} = {37239BB8-2FA4-4831-A7EA-AF89D74EA10E}
 		{4123C976-739E-42A2-87FB-E04D163BC99C} = {BB2DB888-0F52-4CB5-9625-9D99A33DCE4F}
 	EndGlobalSection
 EndGlobal
diff --git a/src/Tools/Deployment/Deployment.csproj b/src/Tools/Deployment/Deployment.csproj
new file mode 100644
index 000000000..6d7a332df
--- /dev/null
+++ b/src/Tools/Deployment/Deployment.csproj
@@ -0,0 +1,62 @@
+<?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>
+    <ProjectGuid>{9D59077D-1A05-4D6C-A1A4-FB748D200578}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>ScriptSharp</RootNamespace>
+    <AssemblyName>ScriptSharp.Deployment</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="Microsoft.Build" />
+    <Reference Include="Microsoft.Build.Framework" />
+    <Reference Include="Microsoft.Build.Utilities" />
+    <Reference Include="System" />
+    <Reference Include="System.XML" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="..\..\ScriptSharp.cs">
+      <Link>Properties\ScriptSharp.cs</Link>
+    </Compile>
+    <Compile Include="ScriptDeployTask.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="ScriptSharpWeb.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/Tools/Deployment/Properties/AssemblyInfo.cs b/src/Tools/Deployment/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..db773d527
--- /dev/null
+++ b/src/Tools/Deployment/Properties/AssemblyInfo.cs
@@ -0,0 +1,10 @@
+// AssemblyInfo.cs
+// Script#/Common
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Reflection;
+
+[assembly: AssemblyTitle("ScriptSharp.Deployment")]
+[assembly: AssemblyDescription("Script# Web Application Integration")]
diff --git a/src/Tools/Deployment/ScriptDeployTask.cs b/src/Tools/Deployment/ScriptDeployTask.cs
new file mode 100644
index 000000000..1c23feb45
--- /dev/null
+++ b/src/Tools/Deployment/ScriptDeployTask.cs
@@ -0,0 +1,185 @@
+// ScriptDeployTask.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.Linq;
+using Microsoft.Build.Evaluation;
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+
+namespace ScriptSharp.Tasks {
+
+    public sealed class ScriptDeployTask : Task {
+
+        private string _projectPath;
+        private string _scriptsPath;
+        private ITaskItem[] _references;
+
+        private HashSet<string> _scriptSet;
+        private List<ITaskItem> _scripts;
+
+        [Required]
+        public string ProjectPath {
+            get {
+                return _projectPath;
+            }
+            set {
+                _projectPath = value;
+            }
+        }
+
+        [Required]
+        public ITaskItem[] References {
+            get {
+                return _references;
+            }
+            set {
+                _references = value;
+            }
+        }
+
+        [Output]
+        public ITaskItem[] Scripts {
+            get {
+                if (_scripts == null) {
+                    return new ITaskItem[0];
+                }
+                return _scripts.ToArray();
+            }
+        }
+
+        public string ScriptsPath {
+            get {
+                if (String.IsNullOrEmpty(_scriptsPath)) {
+                    return "Scripts";
+                }
+                return _scriptsPath;
+            }
+            set {
+                _scriptsPath = value;
+            }
+        }
+
+        private void CopyFile(string sourceFilePath, string targetFilePath) {
+            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);
+        }
+
+        private void DeployScripts(string projectName, string scriptsFile, string projectPath, string scriptsTargetPath) {
+            string sourceDirectory = Path.GetDirectoryName(scriptsFile);
+            string[] scripts = File.ReadAllLines(scriptsFile);
+
+            scripts = scripts.Select(s => Path.Combine(sourceDirectory, s)).ToArray();
+
+            Log.LogMessage("Deploying scripts from {0} project:", projectName);
+            foreach (string scriptPath in scripts) {
+                string scriptFile = Path.GetFileName(scriptPath);
+                if (scriptFile.Equals("ss.js", StringComparison.OrdinalIgnoreCase) ||
+                    scriptFile.Equals("ss.min.js", StringComparison.OrdinalIgnoreCase)) {
+                    continue;
+                }
+
+                string targetScriptPath = Path.Combine(scriptsTargetPath, scriptFile);
+                if (_scriptSet.Add(targetScriptPath)) {
+                    CopyFile(scriptPath, targetScriptPath);
+
+                    Uri baseUri = new Uri(projectPath, UriKind.Absolute);
+                    Uri targetUri = new Uri(targetScriptPath, UriKind.Absolute);
+                    string relativePath = Uri.UnescapeDataString(baseUri.MakeRelativeUri(targetUri).ToString()).Replace("/", "\\");
+
+                    Log.LogMessage("-> " + relativePath);
+                    _scripts.Add(new TaskItem(relativePath));
+                }
+            }
+        }
+
+        public override bool Execute() {
+            _scriptSet = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+            _scripts = new List<ITaskItem>();
+
+            string projectDirectory = Path.GetDirectoryName(_projectPath);
+            string scriptsDirectory = Path.Combine(projectDirectory, ScriptsPath);
+            if (Directory.Exists(scriptsDirectory) == false) {
+                Directory.CreateDirectory(scriptsDirectory);
+            }
+
+            foreach (ITaskItem reference in _references) {
+                string referencePath = Path.GetFullPath(reference.ItemSpec);
+                string referenceName = Path.GetFileNameWithoutExtension(referencePath);
+
+                Project project = GetReferencedProject(referencePath);
+                if (project == null) {
+                    Log.LogError("Unable to load project {0}.", referenceName);
+                    return false;
+                }
+
+                if (IsScriptSharpProject(project) == false) {
+                    continue;
+                }
+
+                string scriptsFile = GetScriptsFile(project, referencePath);
+                if (String.IsNullOrEmpty(scriptsFile)) {
+                    Log.LogError("Unable to find scripts list for project {0}.", referenceName);
+                    return false;
+                }
+
+                try {
+                    DeployScripts(referenceName, scriptsFile, _projectPath, scriptsDirectory);
+                }
+                catch (Exception e) {
+                    Log.LogError("Error deploying scripts from project {0}.\r\n{1}", referenceName, e.ToString());
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        private string GetScriptsFile(Project project, string projectPath) {
+            string outputPath = project.GetProperty("OutputPath").EvaluatedValue;
+            string assemblyName = project.GetProperty("AssemblyName").EvaluatedValue;
+
+            string scriptsFilePath = Path.Combine(Path.GetDirectoryName(projectPath), outputPath, assemblyName + ".scripts");
+            if (File.Exists(scriptsFilePath) == false) {
+                return null;
+            }
+
+            return scriptsFilePath;
+        }
+
+        private Project GetReferencedProject(string projectPath) {
+            ProjectCollection projects = ProjectCollection.GlobalProjectCollection;
+            ICollection<Project> loadedProjects = projects.GetLoadedProjects(projectPath);
+
+            Project project = loadedProjects.FirstOrDefault();
+            if (project == null) {
+                project = new Project(projectPath);
+            }
+
+            return project;
+        }
+
+        private bool IsScriptSharpProject(Project project) {
+            ProjectProperty scriptSharpProperty = project.GetProperty("ScriptSharp");
+            if ((scriptSharpProperty != null) &&
+                scriptSharpProperty.EvaluatedValue.Equals("true", StringComparison.OrdinalIgnoreCase)) {
+                return true;
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/src/Tools/Deployment/ScriptSharpWeb.targets b/src/Tools/Deployment/ScriptSharpWeb.targets
new file mode 100644
index 000000000..4264b3a96
--- /dev/null
+++ b/src/Tools/Deployment/ScriptSharpWeb.targets
@@ -0,0 +1,28 @@
+<!--
+*******************************************************************************
+ScriptSharpWeb.targets
+Enables deployment of Script#-generated scripts into Web applications.
+
+Copyright (c) 2013. Script# Project. All rights reserved.
+*******************************************************************************
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <UsingTask TaskName="ScriptDeployTask" AssemblyFile="ScriptSharp.Deployment.dll" />
+
+  <Target Name="CopyReferencedScripts" Returns="@(DeployedScripts)">
+    <ScriptDeployTask
+      References="@(ProjectReference)"
+      ScriptsPath="$(ScriptsPath)"
+      ProjectPath="$(MSBuildProjectFullPath)">
+      <Output TaskParameter="Scripts" ItemName="DeployedScripts" />
+    </ScriptDeployTask>
+    <ItemGroup>
+      <Content Include="@(DeployedScripts)" KeepDuplicates="False" />
+    </ItemGroup>
+  </Target>
+
+  <PropertyGroup>
+    <CompileDependsOn>$(CompileDependsOn);CopyReferencedScripts</CompileDependsOn>
+  </PropertyGroup>
+</Project>
diff --git a/src/Tools/Testing/WebBrowser.cs b/src/Tools/Testing/WebBrowser.cs
index 5bbcb5f77..76f556d09 100644
--- a/src/Tools/Testing/WebBrowser.cs
+++ b/src/Tools/Testing/WebBrowser.cs
@@ -47,9 +47,19 @@ public string Name {
         private static string GetChromeExecutablePath() {
             string path = null;
 
-            RegistryKey chromeKey = Registry.CurrentUser.OpenSubKey(@"Software\Microsoft\Windows\CurrentVersion\Uninstall\Google Chrome\");
+            RegistryKey chromeKey = Registry.LocalMachine.OpenSubKey(@"Software\Microsoft\Windows\CurrentVersion\App Paths\chrome.exe\");
             if (chromeKey != null) {
-                path = Path.Combine((string)chromeKey.GetValue("InstallLocation"), "chrome.exe");
+                path = (string)chromeKey.GetValue("Path");
+            }
+            else {
+                chromeKey = Registry.CurrentUser.OpenSubKey(@"Software\Microsoft\Windows\CurrentVersion\Uninstall\Google Chrome\");
+                if (chromeKey != null) {
+                    path = (string)chromeKey.GetValue("InstallLocation");
+                }
+            }
+
+            if (path != null) {
+                path = Path.Combine(path, "chrome.exe");
                 if (!File.Exists(path)) {
                     path = null;
                 }
diff --git a/src/ZipX/Packages/Lib.Node.Azure.nuspec b/src/ZipX/Packages/Lib.Node.Azure.nuspec
new file mode 100644
index 000000000..ee7cee95b
--- /dev/null
+++ b/src/ZipX/Packages/Lib.Node.Azure.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.Node.Azure</id>
+    <version>0.8</version>
+    <title>Script# Azure for Node.js 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 Azure APIs in node.js Script# projects.</summary>
+    <description>
+      This package contains contains the Script.Node.Azure assembly that allows you to reference and program against the Windows Azure APIs when creating Node.js based applications and modules with Script#.
+    </description>
+    <tags>script azure windowsazure node nodejs javascript server scriptsharp thescriptsharp</tags>
+    <language>en-US</language>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <dependencies>
+      <dependency id="ScriptSharp" version="0.8" />
+      <dependency id="ScriptSharp.Lib.Node" version="0.8" />
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="..\..\..\bin\Release\Script.Node.Azure.dll" target="lib" />
+    <file src="..\..\..\bin\Release\Script.Node.Azure.xml" target="lib" />
+    <file src="..\..\..\bin\Release\Script.Node.Azure.txt" target="lib" />
+  </files>
+</package>
diff --git a/src/ZipX/Packages/Lib.Node.Neo4j.nuspec b/src/ZipX/Packages/Lib.Node.Neo4j.nuspec
new file mode 100644
index 000000000..880393b9e
--- /dev/null
+++ b/src/ZipX/Packages/Lib.Node.Neo4j.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.Node.Neo4j</id>
+    <version>0.8</version>
+    <title>Script# Neo4j for Node.js 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 Neo4j APIs in node.js Script# projects.</summary>
+    <description>
+      This package contains contains the Script.Node.Neo4j assembly that allows you to reference and program against the Neo4j APIs when creating Node.js based applications and modules with Script#.
+    </description>
+    <tags>script neo4j graph node nodejs javascript server scriptsharp thescriptsharp</tags>
+    <language>en-US</language>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <dependencies>
+      <dependency id="ScriptSharp" version="0.8" />
+      <dependency id="ScriptSharp.Lib.Node" version="0.8" />
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="..\..\..\bin\Release\Script.Node.Neo4j.dll" target="lib" />
+    <file src="..\..\..\bin\Release\Script.Node.Neo4j.xml" target="lib" />
+    <file src="..\..\..\bin\Release\Script.Node.Neo4j.txt" target="lib" />
+  </files>
+</package>
diff --git a/src/ZipX/Packages/Lib.Node.Restify.nuspec b/src/ZipX/Packages/Lib.Node.Restify.nuspec
new file mode 100644
index 000000000..d62e0c784
--- /dev/null
+++ b/src/ZipX/Packages/Lib.Node.Restify.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.Node.Restify</id>
+    <version>0.8</version>
+    <title>Script# Restify for Node.js 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 Restify APIs in node.js Script# projects.</summary>
+    <description>
+      This package contains contains the Script.Node.Restify assembly that allows you to reference and program against the Restify APIs when creating Node.js based applications and modules with Script#.
+    </description>
+    <tags>script restify node nodejs javascript server scriptsharp thescriptsharp</tags>
+    <language>en-US</language>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <dependencies>
+      <dependency id="ScriptSharp" version="0.8" />
+      <dependency id="ScriptSharp.Lib.Node" version="0.8" />
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="..\..\..\bin\Release\Script.Node.Restify.dll" target="lib" />
+    <file src="..\..\..\bin\Release\Script.Node.Restify.xml" target="lib" />
+    <file src="..\..\..\bin\Release\Script.Node.Restify.txt" target="lib" />
+  </files>
+</package>
diff --git a/src/ZipX/Packages/Runtime.nuspec b/src/ZipX/Packages/Runtime.nuspec
index de194e309..06bb2a6fa 100644
--- a/src/ZipX/Packages/Runtime.nuspec
+++ b/src/ZipX/Packages/Runtime.nuspec
@@ -3,15 +3,15 @@
   <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <id>ScriptSharp.Runtime</id>
     <version>0.8</version>
-    <title>Script# Runtime Scripts</title>
+    <title>Script# Runtime and Script Deployment Support</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>
+    <summary>Provides the core javascript runtime (ss.js) for Script#-based scripts and script deployment functionality into Web application 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).
+      This package contains ss.js and related scripts used by script# generated scripts at runtime. It also adds script deployment functionality, to copy generated scripts from referenced script# projects into Web applications.
     </description>
     <tags>script scriptsharp javascript html aspnet mvc thescriptsharp</tags>
     <language>en-US</language>
@@ -22,5 +22,10 @@
     <file src="..\..\..\bin\Release\ss.min.js" target="content\Scripts" />
     <file src="..\..\..\bin\Release\ssloader.js" target="content\Scripts" />
     <file src="..\..\..\bin\Release\ssloader.min.js" target="content\Scripts" />
+    <file src="..\..\..\bin\Release\ScriptSharp.Deployment.dll" target="tools" />
+    <file src="..\..\..\bin\Release\ScriptSharpWeb.targets" target="tools" />
+    <file src="Runtime\Install.ps1" target="tools" />
+    <file src="Runtime\Uninstall.ps1" target="tools" />
+    <file src="Runtime\Reset.psm1" target="tools" />
   </files>
 </package>
diff --git a/src/ZipX/Packages/Runtime/Install.ps1 b/src/ZipX/Packages/Runtime/Install.ps1
new file mode 100644
index 000000000..f477b16eb
--- /dev/null
+++ b/src/ZipX/Packages/Runtime/Install.ps1
@@ -0,0 +1,29 @@
+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
+}
+
+# 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 "ScriptSharpWeb.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/Runtime/Reset.psm1 b/src/ZipX/Packages/Runtime/Reset.psm1
new file mode 100644
index 000000000..7d8ca8798
--- /dev/null
+++ b/src/ZipX/Packages/Runtime/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("ScriptSharpWeb.targets") -gt 0) {
+        $msbuild.Xml.RemoveChild($import)
+      }
+    }
+  }
+}
diff --git a/src/ZipX/Packages/Runtime/Uninstall.ps1 b/src/ZipX/Packages/Runtime/Uninstall.ps1
new file mode 100644
index 000000000..4453cf626
--- /dev/null
+++ b/src/ZipX/Packages/Runtime/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/ProjectTemplates/HTMLApplication/Application.csproj b/src/ZipX/ProjectTemplates/HTMLApplication/Application.csproj
index 2374528f9..bcb3b6168 100644
--- a/src/ZipX/ProjectTemplates/HTMLApplication/Application.csproj
+++ b/src/ZipX/ProjectTemplates/HTMLApplication/Application.csproj
@@ -13,7 +13,6 @@
     <GenerateScript>True</GenerateScript>
     <GenerateResources>True</GenerateResources>
     <MinimizeScript>True</MinimizeScript>
-    <CrunchScript>True</CrunchScript>
     <CopyReferences>True</CopyReferences>
    </PropertyGroup>
    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/src/ZipX/ProjectTemplates/HTMLModule/Module.csproj b/src/ZipX/ProjectTemplates/HTMLModule/Module.csproj
index 95df62bb5..39490e368 100644
--- a/src/ZipX/ProjectTemplates/HTMLModule/Module.csproj
+++ b/src/ZipX/ProjectTemplates/HTMLModule/Module.csproj
@@ -13,7 +13,6 @@
     <GenerateScript>True</GenerateScript>
     <GenerateResources>True</GenerateResources>
     <MinimizeScript>True</MinimizeScript>
-    <CrunchScript>True</CrunchScript>
     <CopyReferences>True</CopyReferences>
    </PropertyGroup>
    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/src/ZipX/ProjectTemplates/NodeApplication/Application.csproj b/src/ZipX/ProjectTemplates/NodeApplication/Application.csproj
index ebec60948..7233aa44d 100644
--- a/src/ZipX/ProjectTemplates/NodeApplication/Application.csproj
+++ b/src/ZipX/ProjectTemplates/NodeApplication/Application.csproj
@@ -13,7 +13,6 @@
     <GenerateScript>True</GenerateScript>
     <GenerateResources>True</GenerateResources>
     <MinimizeScript>False</MinimizeScript>
-    <CrunchScript>False</CrunchScript>
     <CopyReferences>True</CopyReferences>
     <CopyReferencesPath>node_modules</CopyReferencesPath>
    </PropertyGroup>
diff --git a/src/ZipX/ProjectTemplates/NodeModule/Module.csproj b/src/ZipX/ProjectTemplates/NodeModule/Module.csproj
index ebec60948..7233aa44d 100644
--- a/src/ZipX/ProjectTemplates/NodeModule/Module.csproj
+++ b/src/ZipX/ProjectTemplates/NodeModule/Module.csproj
@@ -13,7 +13,6 @@
     <GenerateScript>True</GenerateScript>
     <GenerateResources>True</GenerateResources>
     <MinimizeScript>False</MinimizeScript>
-    <CrunchScript>False</CrunchScript>
     <CopyReferences>True</CopyReferences>
     <CopyReferencesPath>node_modules</CopyReferencesPath>
    </PropertyGroup>
diff --git a/src/ZipX/ProjectTemplates/jQueryApplication/Application.csproj b/src/ZipX/ProjectTemplates/jQueryApplication/Application.csproj
index 2374528f9..bcb3b6168 100644
--- a/src/ZipX/ProjectTemplates/jQueryApplication/Application.csproj
+++ b/src/ZipX/ProjectTemplates/jQueryApplication/Application.csproj
@@ -13,7 +13,6 @@
     <GenerateScript>True</GenerateScript>
     <GenerateResources>True</GenerateResources>
     <MinimizeScript>True</MinimizeScript>
-    <CrunchScript>True</CrunchScript>
     <CopyReferences>True</CopyReferences>
    </PropertyGroup>
    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/src/ZipX/ProjectTemplates/jQueryPlugin/Plugin.csproj b/src/ZipX/ProjectTemplates/jQueryPlugin/Plugin.csproj
index b72322e3f..8cecbeee7 100644
--- a/src/ZipX/ProjectTemplates/jQueryPlugin/Plugin.csproj
+++ b/src/ZipX/ProjectTemplates/jQueryPlugin/Plugin.csproj
@@ -13,7 +13,6 @@
     <GenerateScript>True</GenerateScript>
     <GenerateResources>True</GenerateResources>
     <MinimizeScript>True</MinimizeScript>
-    <CrunchScript>True</CrunchScript>
     <CopyReferences>True</CopyReferences>
    </PropertyGroup>
    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/src/ZipX/VSIX/Extension.vsixmanifest b/src/ZipX/VSIX/Extension.vsixmanifest
index d8ed80ae0..459fd8d27 100644
--- a/src/ZipX/VSIX/Extension.vsixmanifest
+++ b/src/ZipX/VSIX/Extension.vsixmanifest
@@ -29,6 +29,13 @@
         <Edition>VCSExpress</Edition>
         <Edition>VWDExpress</Edition>
       </VisualStudio>
+      <VisualStudio Version="12.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>
diff --git a/src/ZipX/ZipX.csproj b/src/ZipX/ZipX.csproj
index 9020249b3..faa70ac0b 100644
--- a/src/ZipX/ZipX.csproj
+++ b/src/ZipX/ZipX.csproj
@@ -28,7 +28,10 @@
     <None Include="Packages\Lib.Knockout.nuspec" />
     <None Include="Packages\Lib.Node.nuspec" />
     <None Include="Packages\Lib.Node.Express.nuspec" />
+    <None Include="Packages\Lib.Node.Restify.nuspec" />
     <None Include="Packages\Lib.Node.Mongo.nuspec" />
+    <None Include="Packages\Lib.Node.Neo4j.nuspec" />
+    <None Include="Packages\Lib.Node.Azure.nuspec" />
     <None Include="Packages\Testing.nuspec" />
     <None Include="Packages\Runtime.nuspec" />
   </ItemGroup>
@@ -80,7 +83,10 @@
     <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\Lib.Node.nuspec -OutputDirectory $(OutputPath)Packages -NoPackageAnalysis" />
     <Exec Command="$(ProjectDir)..\..\tools\bin\nuget pack $(ProjectDir)Packages\Lib.Node.Express.nuspec -OutputDirectory $(OutputPath)Packages -NoPackageAnalysis" />
+    <Exec Command="$(ProjectDir)..\..\tools\bin\nuget pack $(ProjectDir)Packages\Lib.Node.Restify.nuspec -OutputDirectory $(OutputPath)Packages -NoPackageAnalysis" />
     <Exec Command="$(ProjectDir)..\..\tools\bin\nuget pack $(ProjectDir)Packages\Lib.Node.Mongo.nuspec -OutputDirectory $(OutputPath)Packages -NoPackageAnalysis" />
+    <Exec Command="$(ProjectDir)..\..\tools\bin\nuget pack $(ProjectDir)Packages\Lib.Node.Neo4j.nuspec -OutputDirectory $(OutputPath)Packages -NoPackageAnalysis" />
+    <Exec Command="$(ProjectDir)..\..\tools\bin\nuget pack $(ProjectDir)Packages\Lib.Node.Azure.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" />
diff --git a/tests/Core/BrowserTest.cs b/tests/Core/BrowserTest.cs
index 5b450750a..2dc75d4ab 100644
--- a/tests/Core/BrowserTest.cs
+++ b/tests/Core/BrowserTest.cs
@@ -22,6 +22,7 @@ public abstract class BrowserTest {
         private static readonly string[] _codeFiles = new string[] {
             "OOP.cs"
         };
+        private static string _compilationFailures;
 
         private const int _port = 3976;
 
@@ -40,16 +41,24 @@ static BrowserTest() {
                 File.Copy(Path.Combine(binDirectory, script), Path.Combine(scriptsDirectory, script), overwrite: true);
             }
 
+            List<string> codeFailures = new List<string>();
+
             string mscorlibPath = Path.Combine(binDirectory, "mscorlib.dll");
             foreach (string codeFile in _codeFiles) {
                 string script = Path.GetFileNameWithoutExtension(codeFile) + Path.ChangeExtension(".cs", ".js");
 
                 SimpleCompilation compilation = new SimpleCompilation(Path.Combine(scriptsDirectory, script));
-                compilation.AddReference(mscorlibPath)
-                           .AddSource(Path.Combine(codeDirectory, codeFile))
-                           .Execute();
+                bool result = compilation.AddReference(mscorlibPath)
+                                         .AddSource(Path.Combine(codeDirectory, codeFile))
+                                         .Execute();
+
+                if (result == false) {
+                    codeFailures.Add(codeFile);
+                }
             }
 
+            _compilationFailures = (codeFailures.Count == 0) ? null : String.Join(", ", codeFailures);
+
             _webTest = new WebTest();
             _webTest.StartWebServer(_port, webRoot);
         }
@@ -64,6 +73,11 @@ public TestContext TestContext {
         }
 
         protected void RunTest(string url) {
+            if (_compilationFailures != null) {
+                Assert.Fail("Could not run test due to compilation failure of " + _compilationFailures + ".");
+                return;
+            }
+
             Uri testUri = _webTest.GetTestUri(url);
 
             WebTestResult result = _webTest.RunTest(testUri, WebBrowser.Chrome);
diff --git a/tests/ScriptTests.cs b/tests/ScriptTests.cs
index e64325083..6ea00bfb1 100644
--- a/tests/ScriptTests.cs
+++ b/tests/ScriptTests.cs
@@ -22,6 +22,11 @@ public void TestTypeSystem() {
             RunTest("/TypeSystem.htm");
         }
 
+        [TestMethod]
+        public void TestBases() {
+            RunTest("/Bases.htm");
+        }
+
         #region Loader Tests
         [TestMethod]
         public void TestLoader() {
diff --git a/tests/TestCases/Basic/Conditionals/DebugBaseline.txt b/tests/TestCases/Basic/Conditionals/DebugBaseline.txt
index b300d442e..6adf248c7 100644
--- a/tests/TestCases/Basic/Conditionals/DebugBaseline.txt
+++ b/tests/TestCases/Basic/Conditionals/DebugBaseline.txt
@@ -5,24 +5,21 @@ define('test', ['ss'], function(ss) {
 
   // BasicTests.MyDebug
 
-  function BasicTests$MyDebug() {
+  function MyDebug() {
   }
-  BasicTests$MyDebug.showInfo = function() {
-  }
-  BasicTests$MyDebug.traceInfo = function() {
-  }
-  BasicTests$MyDebug.logInfo = function() {
-  }
-  var BasicTests$MyDebug$ = {
-
+  MyDebug.showInfo = function() {
+  };
+  MyDebug.traceInfo = function() {
+  };
+  MyDebug.logInfo = function() {
   };
 
 
   // BasicTests.App
 
-  function BasicTests$App(i) {
+  function App(i) {
     console.assert(false);
-    BasicTests$MyDebug.showInfo();
+    MyDebug.showInfo();
     while (true) {
       console.assert(false);
     }
@@ -44,15 +41,15 @@ define('test', ['ss'], function(ss) {
       console.log('.');
     }
   }
-  var BasicTests$App$ = {
+  var App$ = {
 
   };
 
 
   var $exports = ss.module('test', null,
     {
-      MyDebug: [ BasicTests$MyDebug, BasicTests$MyDebug$, null ],
-      App: [ BasicTests$App, BasicTests$App$, null ]
+      MyDebug: [ MyDebug, null, null ],
+      App: [ App, App$, null ]
     });
 
 
diff --git a/tests/TestCases/Basic/Conditionals/TraceBaseline.txt b/tests/TestCases/Basic/Conditionals/TraceBaseline.txt
index 5118f3ae2..314a855f3 100644
--- a/tests/TestCases/Basic/Conditionals/TraceBaseline.txt
+++ b/tests/TestCases/Basic/Conditionals/TraceBaseline.txt
@@ -5,22 +5,19 @@ define('test', ['ss'], function(ss) {
 
   // BasicTests.MyDebug
 
-  function BasicTests$MyDebug() {
+  function MyDebug() {
   }
-  BasicTests$MyDebug.showInfo = function() {
-  }
-  BasicTests$MyDebug.traceInfo = function() {
-  }
-  BasicTests$MyDebug.logInfo = function() {
-  }
-  var BasicTests$MyDebug$ = {
-
+  MyDebug.showInfo = function() {
+  };
+  MyDebug.traceInfo = function() {
+  };
+  MyDebug.logInfo = function() {
   };
 
 
   // BasicTests.App
 
-  function BasicTests$App(i) {
+  function App(i) {
     while (true) {
     }
     switch (i) {
@@ -28,17 +25,17 @@ define('test', ['ss'], function(ss) {
         break;
     }
     i++;
-    BasicTests$MyDebug.traceInfo();
+    MyDebug.traceInfo();
   }
-  var BasicTests$App$ = {
+  var App$ = {
 
   };
 
 
   var $exports = ss.module('test', null,
     {
-      MyDebug: [ BasicTests$MyDebug, BasicTests$MyDebug$, null ],
-      App: [ BasicTests$App, BasicTests$App$, null ]
+      MyDebug: [ MyDebug, null, null ],
+      App: [ App, App$, null ]
     });
 
 
diff --git a/tests/TestCases/Basic/Dependencies/Code1Baseline.txt b/tests/TestCases/Basic/Dependencies/Code1Baseline.txt
index 5df95612f..9098c97f5 100644
--- a/tests/TestCases/Basic/Dependencies/Code1Baseline.txt
+++ b/tests/TestCases/Basic/Dependencies/Code1Baseline.txt
@@ -5,18 +5,18 @@ define('test', ['ss', 'lib1'], function(ss, lib1) {
 
   // BasicTests.App
 
-  function BasicTests$App() {
+  function App() {
     var c1 = new lib1.Component1();
     var c2 = new Component2();
   }
-  var BasicTests$App$ = {
+  var App$ = {
 
   };
 
 
   var $exports = ss.module('test', null,
     {
-      App: [ BasicTests$App, BasicTests$App$, null ]
+      App: [ App, App$, null ]
     });
 
 
diff --git a/tests/TestCases/Basic/Dependencies/Code2Baseline.txt b/tests/TestCases/Basic/Dependencies/Code2Baseline.txt
index 30e7ab2db..8eb615e24 100644
--- a/tests/TestCases/Basic/Dependencies/Code2Baseline.txt
+++ b/tests/TestCases/Basic/Dependencies/Code2Baseline.txt
@@ -5,20 +5,20 @@ define('test', ['ss', 'lib1', 'comp3', 'comp4'], function(ss, lib1, comp3, comp4
 
   // BasicTests.App
 
-  function BasicTests$App() {
+  function App() {
     var c1 = new lib1.Component1();
     var c2 = new Component2();
     var c3 = new comp3.Component3();
     var c4 = new Component4();
   }
-  var BasicTests$App$ = {
+  var App$ = {
 
   };
 
 
   var $exports = ss.module('test', null,
     {
-      App: [ BasicTests$App, BasicTests$App$, null ]
+      App: [ App, App$, null ]
     });
 
 
diff --git a/tests/TestCases/Basic/Dependencies/Code3Baseline.txt b/tests/TestCases/Basic/Dependencies/Code3Baseline.txt
index aee0e987d..bb32d1c67 100644
--- a/tests/TestCases/Basic/Dependencies/Code3Baseline.txt
+++ b/tests/TestCases/Basic/Dependencies/Code3Baseline.txt
@@ -5,7 +5,7 @@ define('test', ['ss', 'lib1', '/lib/comp3'], function(ss, lib1, comp3) {
 
   // BasicTests.App
 
-  function BasicTests$App() {
+  function App() {
     var c1 = new lib1.Component1();
     var c2 = new Component2();
     var c3 = new comp3.Component3();
@@ -13,14 +13,14 @@ define('test', ['ss', 'lib1', '/lib/comp3'], function(ss, lib1, comp3) {
       var c4 = new Component4();
     });
   }
-  var BasicTests$App$ = {
+  var App$ = {
 
   };
 
 
   var $exports = ss.module('test', null,
     {
-      App: [ BasicTests$App, BasicTests$App$, null ]
+      App: [ App, App$, null ]
     });
 
 
diff --git a/tests/TestCases/Basic/Dependencies/Code4Baseline.txt b/tests/TestCases/Basic/Dependencies/Code4Baseline.txt
index 43fc4152c..8fa573502 100644
--- a/tests/TestCases/Basic/Dependencies/Code4Baseline.txt
+++ b/tests/TestCases/Basic/Dependencies/Code4Baseline.txt
@@ -5,7 +5,7 @@ define('test', ['ss', 'lib1', '/lib/comp3', 'text!data.html'], function(ss, lib1
 
   // BasicTests.App
 
-  function BasicTests$App() {
+  function App() {
     var c1 = new lib1.Component1();
     var c2 = new Component2();
     var c3 = new comp3.Component3();
@@ -14,14 +14,14 @@ define('test', ['ss', 'lib1', '/lib/comp3', 'text!data.html'], function(ss, lib1
     });
     alert(dataTemplate);
   }
-  var BasicTests$App$ = {
+  var App$ = {
 
   };
 
 
   var $exports = ss.module('test', null,
     {
-      App: [ BasicTests$App, BasicTests$App$, null ]
+      App: [ App, App$, null ]
     });
 
 
diff --git a/tests/TestCases/Basic/DocComments/Baseline.txt b/tests/TestCases/Basic/DocComments/Baseline.txt
index ce66bee49..bd7a0aa61 100644
--- a/tests/TestCases/Basic/DocComments/Baseline.txt
+++ b/tests/TestCases/Basic/DocComments/Baseline.txt
@@ -5,7 +5,7 @@ define('test', ['ss'], function(ss) {
 
   // BasicTests.Suit
 
-  var BasicTests$Suit = {
+  var Suit = {
     heart: 0, 
     spade: 1, 
     club: 2, 
@@ -15,12 +15,12 @@ define('test', ['ss'], function(ss) {
 
   // BasicTests.IInterface
 
-  function BasicTests$IInterface() { }
+  function IInterface() { }
 
 
   // BasicTests.RecordClass
 
-  function BasicTests$RecordClass(count) {
+  function RecordClass(count) {
     var $o = {};
     return $o;
   }
@@ -28,7 +28,7 @@ define('test', ['ss'], function(ss) {
 
   // BasicTests.BaseClass
 
-  function BasicTests$BaseClass(domElement, name, count) {
+  function BaseClass(domElement, name, count) {
     /// <summary>
     /// Represents a base class.
     /// </summary>
@@ -58,22 +58,22 @@ define('test', ['ss'], function(ss) {
     this.instanceField = 0;
     this._domElement = domElement;
   }
-  BasicTests$BaseClass.get_totalCount = function() {
+  BaseClass.get_totalCount = function() {
     /// <summary>
     /// Gets the total count.
     /// </summary>
     /// <value type="Number" integer="true"></value>
     return 0;
-  }
-  BasicTests$BaseClass.staticMethod = function(length) {
+  };
+  BaseClass.staticMethod = function(length) {
     /// <summary>
     /// A static method.
     /// </summary>
     /// <param name="length" type="Number" integer="true">
     /// The length.
     /// </param>
-  }
-  var BasicTests$BaseClass$ = {
+  };
+  var BaseClass$ = {
     get_name: function() {
       /// <summary>
       /// Gets or sets the name.
@@ -195,21 +195,21 @@ define('test', ['ss'], function(ss) {
 
   // BasicTests.InternalClass
 
-  function BasicTests$InternalClass() {
+  function InternalClass() {
     /// <summary>
     /// An internal class.
     /// </summary>
   }
-  var BasicTests$InternalClass$ = {
+  var InternalClass$ = {
 
   };
 
 
   // BasicTests.InternalClassWithNoComments
 
-  function BasicTests$InternalClassWithNoComments() {
+  function InternalClassWithNoComments() {
   }
-  var BasicTests$InternalClassWithNoComments$ = {
+  var InternalClassWithNoComments$ = {
 
   };
 
@@ -220,18 +220,18 @@ define('test', ['ss'], function(ss) {
     /// <summary>
     /// Runs.
     /// </summary>
-  }
+  };
 
 
   // BasicTests.DerivedClass
 
-  function BasicTests$DerivedClass() {
+  function DerivedClass() {
     /// <summary>
     /// Represents a derived class.
     /// </summary>
-    BasicTests$BaseClass.call(this, null, null, 0);
+    BaseClass.call(this, null, null, 0);
   }
-  var BasicTests$DerivedClass$ = {
+  var DerivedClass$ = {
     method3: function(first, last) {
       /// <summary>
       /// Overriden method with params.
@@ -248,18 +248,18 @@ define('test', ['ss'], function(ss) {
 
   var $exports = ss.module('test',
     {
-      InternalClass: [ BasicTests$InternalClass, BasicTests$InternalClass$, null ],
-      InternalClassWithNoComments: [ BasicTests$InternalClassWithNoComments, BasicTests$InternalClassWithNoComments$, null ]
+      InternalClass: [ InternalClass, InternalClass$, null ],
+      InternalClassWithNoComments: [ InternalClassWithNoComments, InternalClassWithNoComments$, null ]
     },
     {
-      Suit: BasicTests$Suit,
-      IInterface: [ BasicTests$IInterface ],
-      RecordClass: BasicTests$RecordClass,
-      BaseClass: [ BasicTests$BaseClass, BasicTests$BaseClass$, null ],
-      DerivedClass: [ BasicTests$DerivedClass, BasicTests$DerivedClass$, BasicTests$BaseClass ]
+      Suit: Suit,
+      IInterface: [ IInterface ],
+      RecordClass: RecordClass,
+      BaseClass: [ BaseClass, BaseClass$, null ],
+      DerivedClass: [ DerivedClass, DerivedClass$, BaseClass ]
     });
 
-  BasicTests$BaseClass.constantField = 3;
+  BaseClass.constantField = 3;
 
   return $exports;
 });
diff --git a/tests/TestCases/Basic/Flags/Baseline.txt b/tests/TestCases/Basic/Flags/Baseline.txt
index b57b027f7..faa3eb6b4 100644
--- a/tests/TestCases/Basic/Flags/Baseline.txt
+++ b/tests/TestCases/Basic/Flags/Baseline.txt
@@ -5,9 +5,9 @@ define('test', ['ss'], function(ss) {
 
   // BasicTests.App
 
-  function BasicTests$App() {
+  function App() {
   }
-  var BasicTests$App$ = {
+  var App$ = {
     method1: function(i) {
       var j = i;
       var x = j++;
@@ -21,7 +21,7 @@ define('test', ['ss'], function(ss) {
 
   var $exports = ss.module('test', null,
     {
-      App: [ BasicTests$App, BasicTests$App$, null ]
+      App: [ App, App$, null ]
     });
 
 
diff --git a/tests/TestCases/Basic/Includes/MultipleIncBaseline.txt b/tests/TestCases/Basic/Includes/MultipleIncBaseline.txt
index 054bc9401..920451184 100644
--- a/tests/TestCases/Basic/Includes/MultipleIncBaseline.txt
+++ b/tests/TestCases/Basic/Includes/MultipleIncBaseline.txt
@@ -6,16 +6,16 @@
 
   // Basic.App
 
-  function Basic$App() {
+  function App() {
   }
-  var Basic$App$ = {
+  var App$ = {
 
   };
 
 
   var $exports = ss.module('basic', null,
     {
-      App: [ Basic$App, Basic$App$, null ]
+      App: [ App, App$, null ]
     });
 
 
diff --git a/tests/TestCases/Basic/Includes/SingleIncBaseline.txt b/tests/TestCases/Basic/Includes/SingleIncBaseline.txt
index 4e0297385..299a56c9b 100644
--- a/tests/TestCases/Basic/Includes/SingleIncBaseline.txt
+++ b/tests/TestCases/Basic/Includes/SingleIncBaseline.txt
@@ -5,16 +5,16 @@
 
 // Basic.App
 
-function Basic$App() {
+function App() {
 }
-var Basic$App$ = {
+var App$ = {
 
 };
 
 
 var $exports = ss.module('basic', null,
   {
-    App: [ Basic$App, Basic$App$, null ]
+    App: [ App, App$, null ]
   });
 
 
diff --git a/tests/TestCases/Basic/Includes/ZeroIncBaseline.txt b/tests/TestCases/Basic/Includes/ZeroIncBaseline.txt
index 46ab10816..29a53f0a1 100644
--- a/tests/TestCases/Basic/Includes/ZeroIncBaseline.txt
+++ b/tests/TestCases/Basic/Includes/ZeroIncBaseline.txt
@@ -4,16 +4,16 @@
 {include:pre.js}
 // Basic.App
 
-function Basic$App() {
+function App() {
 }
-var Basic$App$ = {
+var App$ = {
 
 };
 
 
 var $exports = ss.module('basic', null,
   {
-    App: [ Basic$App, Basic$App$, null ]
+    App: [ App, App$, null ]
   });
 
 
diff --git a/tests/TestCases/Basic/Metadata/Baseline.txt b/tests/TestCases/Basic/Metadata/Baseline.txt
index f64abef15..dac4adc20 100644
--- a/tests/TestCases/Basic/Metadata/Baseline.txt
+++ b/tests/TestCases/Basic/Metadata/Baseline.txt
@@ -609,7 +609,7 @@ Types:
             Method: Parse
                 AssociatedType: Date
                 Visibility: Public, Static
-                Generated Name: parseDate
+                Generated Name: ss.date
                 Abstract: False
             Method: SetDate
                 AssociatedType: Void
@@ -1513,6 +1513,21 @@ Types:
                 Visibility: Public, Static
                 Generated Name: invokeMethod
                 Abstract: False
+            Method: IsFalsey
+                AssociatedType: Boolean
+                Visibility: Public, Static
+                Generated Name: isFalsey
+                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: IsNull
                 AssociatedType: Boolean
                 Visibility: Public, Static
@@ -1533,11 +1548,21 @@ Types:
                 Visibility: Public, Static
                 Generated Name: ss.isValue
                 Abstract: False
+            Method: IsTruthy
+                AssociatedType: Boolean
+                Visibility: Public, Static
+                Generated Name: isTruthy
+                Abstract: False
             Method: Literal
                 AssociatedType: Object
                 Visibility: Public, Static
                 Generated Name: literal
                 Abstract: False
+            Method: Or
+                AssociatedType: TValue
+                Visibility: Public, Static
+                Generated Name: or
+                Abstract: False
             Method: SetField
                 AssociatedType: Void
                 Visibility: Public, Static
@@ -1556,7 +1581,7 @@ Types:
             Method: Value
                 AssociatedType: TValue
                 Visibility: Public, Static
-                Generated Name: value
+                Generated Name: ss.value
                 Abstract: False
             Method: Enumerate
                 AssociatedType: Object
@@ -1811,7 +1836,7 @@ Types:
             Method: Trim
                 AssociatedType: String
                 Visibility: Public
-                Generated Name: trim
+                Generated Name: ss.trim
                 Abstract: False
             Method: TrimEnd
                 AssociatedType: String
@@ -3644,6 +3669,11 @@ Types:
                 Visibility: Public, Static
                 Generated Name: any
                 Abstract: False
+            Method: ChangeWith
+                AssociatedType: Task`1
+                Visibility: Public
+                Generated Name: changeWith
+                Abstract: False
             Method: ContinueWith
                 AssociatedType: Task
                 Visibility: Public
@@ -3681,6 +3711,11 @@ Types:
                 AssociatedType: T
                 Visibility: Public
                 Generated Name: result
+            Method: ChangeWith
+                AssociatedType: Task`1
+                Visibility: Public
+                Generated Name: changeWith
+                Abstract: False
             Method: ContinueWith
                 AssociatedType: Task`1
                 Visibility: Public
@@ -3725,7 +3760,7 @@ define('test', ['ss'], function(ss) {
 
   // BasicTests.AppFlags
 
-  var BasicTests$AppFlags = {
+  var AppFlags = {
     AAA: 1, 
     BBB: 2
   };
@@ -3733,7 +3768,7 @@ define('test', ['ss'], function(ss) {
 
   // BasicTests.Mode
 
-  var BasicTests$Mode = {
+  var Mode = {
     mode1: 0, 
     mode2: 1
   };
@@ -3741,17 +3776,17 @@ define('test', ['ss'], function(ss) {
 
   // BasicTests.IFoo
 
-  function BasicTests$IFoo() { }
+  function IFoo() { }
 
 
   // BasicTests.IApp
 
-  function BasicTests$IApp() { }
+  function IApp() { }
 
 
   // BasicTests.Point
 
-  function BasicTests$Point(x, y) {
+  function Point(x, y) {
     var $o = {};
     $o.x = x;
     $o.y = y;
@@ -3761,9 +3796,9 @@ define('test', ['ss'], function(ss) {
 
   // BasicTests.App
 
-  function BasicTests$App() {
+  function App() {
   }
-  var BasicTests$App$ = {
+  var App$ = {
     add_event1: function(value) {
       this.__event1 = ss.bindAdd(this.__event1, value);
     },
@@ -3783,9 +3818,9 @@ define('test', ['ss'], function(ss) {
 
   // BasicTests.AppHelper
 
-  function BasicTests$AppHelper() {
+  function AppHelper() {
   }
-  var BasicTests$AppHelper$ = {
+  var AppHelper$ = {
     get_prop1: function() {
       return 0;
     },
@@ -3806,20 +3841,20 @@ define('test', ['ss'], function(ss) {
   // BasicTests.Util
 
   $global.showHelp = function() {
-  }
+  };
 
 
   var $exports = ss.module('test',
     {
-      IFoo: [ BasicTests$IFoo ],
-      Point: BasicTests$Point,
-      AppHelper: [ BasicTests$AppHelper, BasicTests$AppHelper$, null ]
+      IFoo: [ IFoo ],
+      Point: Point,
+      AppHelper: [ AppHelper, AppHelper$, null ]
     },
     {
-      AppFlags: BasicTests$AppFlags,
-      Mode: BasicTests$Mode,
-      IApp: [ BasicTests$IApp ],
-      App: [ BasicTests$App, BasicTests$App$, null, BasicTests$IApp ]
+      AppFlags: AppFlags,
+      Mode: Mode,
+      IApp: [ IApp ],
+      App: [ App, App$, null, IApp ]
     });
 
 
diff --git a/tests/TestCases/Basic/Minimization/Baseline.txt b/tests/TestCases/Basic/Minimization/Baseline.txt
index f041c5ecf..daf9da6f6 100644
--- a/tests/TestCases/Basic/Minimization/Baseline.txt
+++ b/tests/TestCases/Basic/Minimization/Baseline.txt
@@ -43,7 +43,7 @@ define('test', ['ss', 'lib'], function(ss, lib) {
 
   // BasicTests.AppFlags
 
-  var BasicTests$AppFlags = {
+  var AppFlags = {
     AAA: 0, 
     BBB: 1
   };
@@ -51,12 +51,12 @@ define('test', ['ss', 'lib'], function(ss, lib) {
 
   // BasicTests.IApp
 
-  function BasicTests$IApp() { }
+  function IApp() { }
 
 
   // BasicTests.MyData
 
-  function BasicTests$MyData(a, b) {
+  function MyData(a, b) {
     var $o = {};
     $o.$0 = a;
     $o.$1 = b;
@@ -67,34 +67,40 @@ define('test', ['ss', 'lib'], function(ss, lib) {
   // BasicTests.GlobalMethodsClass
 
   $global.run = function() {
-  }
+  };
 
 
-  // BasicTests.BaseBaseClass
+  // BasicTests.App
 
-  function BasicTests$BaseBaseClass() {
+  function App() {
+    var helper = new AppHelper();
+    helper.$0();
   }
-  var BasicTests$BaseBaseClass$ = {
+  var App$ = {
+    run: function() {
+    },
     $0: function() {
+    },
+    $1: function() {
     }
   };
 
 
-  // BasicTests.ABC
+  // BasicTests.AppHelper
 
-  function BasicTests$ABC() {
-    var d = { };
+  function AppHelper() {
   }
-  var BasicTests$ABC$ = {
-
+  var AppHelper$ = {
+    $0: function() {
+    }
   };
 
 
   // BasicTests.Bar
 
-  function BasicTests$Bar() {
+  function Bar() {
   }
-  var BasicTests$Bar$ = {
+  var Bar$ = {
     $0: function() {
     },
     toString: function() {
@@ -105,76 +111,70 @@ define('test', ['ss', 'lib'], function(ss, lib) {
   };
 
 
-  // BasicTests.AppHelper
+  // BasicTests.BaseBaseClass
 
-  function BasicTests$AppHelper() {
+  function BaseBaseClass() {
   }
-  var BasicTests$AppHelper$ = {
+  var BaseBaseClass$ = {
     $0: function() {
     }
   };
 
 
-  // BasicTests.App
+  // BasicTests.ABC
 
-  function BasicTests$App() {
-    var helper = new BasicTests$AppHelper();
-    helper.$0();
+  function ABC() {
+    var d = { };
   }
-  var BasicTests$App$ = {
-    run: function() {
-    },
-    $0: function() {
-    },
-    $1: function() {
-    }
+  var ABC$ = {
+
   };
 
 
-  // BasicTests.BaseClass
+  // BasicTests.Bar2
 
-  function BasicTests$BaseClass() {
-    BasicTests$BaseBaseClass.call(this);
+  function Bar2() {
+    Bar.call(this);
   }
-  var BasicTests$BaseClass$ = {
-    $1: function() {
-    }
+  var Bar2$ = {
+
   };
 
 
-  // BasicTests.Bar2
+  // BasicTests.BarCustom
 
-  function BasicTests$Bar2() {
-    BasicTests$Bar.call(this);
+  function BarCustom() {
+    Bar.call(this);
   }
-  var BasicTests$Bar2$ = {
+  var BarCustom$ = {
 
   };
 
 
-  // BasicTests.BarCustom
+  // BasicTests.BaseClass
 
-  function BasicTests$BarCustom() {
-    BasicTests$Bar.call(this);
+  function BaseClass() {
+    BaseBaseClass.call(this);
   }
-  var BasicTests$BarCustom$ = {
-
+  var BaseClass$ = {
+    $1: function() {
+    }
   };
 
 
   // BasicTests.BarEx
 
-  function BasicTests$BarEx() {
-    BasicTests$Bar2.call(this);
+  function BarEx() {
+    Bar2.call(this);
   }
-  var BasicTests$BarEx$ = {
+  var BarEx$ = {
     $2: function() {
       var mode = 1;
     },
     $0: function() {
       this.$2();
-      ss.base(this, '$0').call(this);
-      var d = BasicTests$MyData('a', 'b');
+      Bar2.prototype.$0.call(this);
+      var d = MyData('a', 'b');
       d.$0 = d.$1;
     },
     $3: function(blah) {
@@ -238,10 +238,10 @@ define('test', ['ss', 'lib'], function(ss, lib) {
 
   // BasicTests.BarCustom2
 
-  function BasicTests$BarCustom2() {
-    BasicTests$BarCustom.call(this);
+  function BarCustom2() {
+    BarCustom.call(this);
   }
-  var BasicTests$BarCustom2$ = {
+  var BarCustom2$ = {
     $2: function() {
       return 0;
     },
@@ -255,7 +255,7 @@ define('test', ['ss', 'lib'], function(ss, lib) {
 
   // BasicTests.FooBehavior
 
-  function BasicTests$FooBehavior(e, i) {
+  function FooBehavior(e, i) {
     this.c$0 = 0;
     this.c$1 = 0;
     this.c$2 = 0;
@@ -264,7 +264,7 @@ define('test', ['ss', 'lib'], function(ss, lib) {
     this.c$1 = i * 2;
     this.c$2 = i * 4;
   }
-  var BasicTests$FooBehavior$ = {
+  var FooBehavior$ = {
     add_c$4: function(value) {
       this.c$5 = ss.bindAdd(this.c$5, value);
     },
@@ -273,7 +273,7 @@ define('test', ['ss', 'lib'], function(ss, lib) {
     },
     dispose: function() {
       this.c$0 = 0;
-      ss.base(this, 'dispose').call(this);
+      lib.Behavior.prototype.dispose.call(this);
     },
     c$6: function() {
     },
@@ -288,10 +288,10 @@ define('test', ['ss', 'lib'], function(ss, lib) {
 
   // BasicTests.DerivedClass
 
-  function BasicTests$DerivedClass() {
-    BasicTests$BaseClass.call(this);
+  function DerivedClass() {
+    BaseClass.call(this);
   }
-  var BasicTests$DerivedClass$ = {
+  var DerivedClass$ = {
     $2: function() {
     }
   };
@@ -299,10 +299,10 @@ define('test', ['ss', 'lib'], function(ss, lib) {
 
   // BasicTests.MaskTextBox
 
-  function BasicTests$MaskTextBox(e) {
+  function MaskTextBox(e) {
     lib.TextBox.call(this, e);
   }
-  var BasicTests$MaskTextBox$ = {
+  var MaskTextBox$ = {
     e$0: function() {
     },
     e$1: function() {
@@ -312,24 +312,24 @@ define('test', ['ss', 'lib'], function(ss, lib) {
 
   var $exports = ss.module('test',
     {
-      IApp: [ BasicTests$IApp ],
-      MyData: BasicTests$MyData,
-      AppHelper: [ BasicTests$AppHelper, BasicTests$AppHelper$, null ],
-      Bar: [ BasicTests$Bar, BasicTests$Bar$, null ],
-      BaseBaseClass: [ BasicTests$BaseBaseClass, BasicTests$BaseBaseClass$, null ],
-      ABC: [ BasicTests$ABC, BasicTests$ABC$, null ],
-      Bar2: [ BasicTests$Bar2, BasicTests$Bar2$, BasicTests$Bar ],
-      BarCustom: [ BasicTests$BarCustom, BasicTests$BarCustom$, BasicTests$Bar ],
-      BaseClass: [ BasicTests$BaseClass, BasicTests$BaseClass$, BasicTests$BaseBaseClass ],
-      BarEx: [ BasicTests$BarEx, BasicTests$BarEx$, BasicTests$Bar2 ],
-      BarCustom2: [ BasicTests$BarCustom2, BasicTests$BarCustom2$, BasicTests$BarCustom ],
-      DerivedClass: [ BasicTests$DerivedClass, BasicTests$DerivedClass$, BasicTests$BaseClass ],
-      MaskTextBox: [ BasicTests$MaskTextBox, BasicTests$MaskTextBox$, lib.TextBox ]
+      IApp: [ IApp ],
+      MyData: MyData,
+      AppHelper: [ AppHelper, AppHelper$, null ],
+      Bar: [ Bar, Bar$, null ],
+      BaseBaseClass: [ BaseBaseClass, BaseBaseClass$, null ],
+      ABC: [ ABC, ABC$, null ],
+      Bar2: [ Bar2, Bar2$, Bar ],
+      BarCustom: [ BarCustom, BarCustom$, Bar ],
+      BaseClass: [ BaseClass, BaseClass$, BaseBaseClass ],
+      BarEx: [ BarEx, BarEx$, Bar2 ],
+      BarCustom2: [ BarCustom2, BarCustom2$, BarCustom ],
+      DerivedClass: [ DerivedClass, DerivedClass$, BaseClass ],
+      MaskTextBox: [ MaskTextBox, MaskTextBox$, lib.TextBox ]
     },
     {
-      AppFlags: BasicTests$AppFlags,
-      App: [ BasicTests$App, BasicTests$App$, null ],
-      FooBehavior: [ BasicTests$FooBehavior, BasicTests$FooBehavior$, lib.Behavior ]
+      AppFlags: AppFlags,
+      App: [ App, App$, null ],
+      FooBehavior: [ FooBehavior, FooBehavior$, lib.Behavior ]
     });
 
 
diff --git a/tests/TestCases/Basic/Resources/Baseline.txt b/tests/TestCases/Basic/Resources/Baseline.txt
index f73ea881f..12a991b13 100644
--- a/tests/TestCases/Basic/Resources/Baseline.txt
+++ b/tests/TestCases/Basic/Resources/Baseline.txt
@@ -5,7 +5,7 @@ define('test', ['ss'], function(ss) {
 
   // Resources.Strings1
 
-  var Resources$Strings1 = {
+  var Strings1 = {
     string1: 'neutral: aaa',
     string2: 'fr: bbb',
     string3: 'fr-FR: ccc'
@@ -14,7 +14,7 @@ define('test', ['ss'], function(ss) {
 
   // Resources.Strings2
 
-  var Resources$Strings2 = {
+  var Strings2 = {
     string1: 's2',
     string2: '1234'
   };
@@ -22,21 +22,21 @@ define('test', ['ss'], function(ss) {
 
   // BasicTests.App
 
-  function BasicTests$App() {
-    var s1 = Resources$Strings1.string1;
+  function App() {
+    var s1 = Strings1.string1;
   }
-  var BasicTests$App$ = {
+  var App$ = {
 
   };
 
 
   var $exports = ss.module('test',
     {
-      Strings1: Resources$Strings1
+      Strings1: Strings1
     },
     {
-      Strings2: Resources$Strings2,
-      App: [ BasicTests$App, BasicTests$App$, null ]
+      Strings2: Strings2,
+      App: [ App, App$, null ]
     });
 
 
diff --git a/tests/TestCases/Basic/Simple/AMDBaseline.txt b/tests/TestCases/Basic/Simple/AMDBaseline.txt
index 90bd5f354..fffbdfb6c 100644
--- a/tests/TestCases/Basic/Simple/AMDBaseline.txt
+++ b/tests/TestCases/Basic/Simple/AMDBaseline.txt
@@ -10,19 +10,19 @@ define('basic', ['ss'], function(ss) {
 
   // Basic.EventArgs
 
-  function Basic$EventArgs() {
+  function EventArgs() {
   }
-  var Basic$EventArgs$ = {
+  var EventArgs$ = {
 
   };
 
 
   // Basic.Button
 
-  function Basic$Button(text) {
+  function Button(text) {
     this._text = text;
   }
-  var Basic$Button$ = {
+  var Button$ = {
     add_click: function(value) {
       this.__click = ss.bindAdd(this.__click, value);
     },
@@ -34,7 +34,7 @@ define('basic', ['ss'], function(ss) {
     },
     performClick: function() {
       if (this.__click != null) {
-        this.__click(this, Basic$EventArgs.Empty);
+        this.__click(this, EventArgs.Empty);
       }
     }
   };
@@ -42,19 +42,19 @@ define('basic', ['ss'], function(ss) {
 
   // Basic.App
 
-  function Basic$App() {
-    this._btn1 = new Basic$Button('OK');
+  function App() {
+    this._btn1 = new Button('OK');
     this._btn1.add_click(ss.bind('_onClickButton', this));
     this._btn1.add_click(ss.bind('_onClickButtonDup', this));
-    this._btn2 = new Basic$Button('Cancel');
+    this._btn2 = new Button('Cancel');
     this._btn2.add_click(ss.bind('_onClickButton', this));
   }
-  Basic$App.main = function(args) {
-    var theApp = new Basic$App();
+  App.main = function(args) {
+    var theApp = new App();
     theApp._btn1.performClick();
     theApp._btn2.performClick();
-  }
-  var Basic$App$ = {
+  };
+  var App$ = {
     _echo: function(s) {
     },
     _onClickButton: function(sender, e) {
@@ -68,12 +68,12 @@ define('basic', ['ss'], function(ss) {
 
   var $exports = ss.module('basic', null,
     {
-      EventArgs: [ Basic$EventArgs, Basic$EventArgs$, null ],
-      Button: [ Basic$Button, Basic$Button$, null ],
-      App: [ Basic$App, Basic$App$, null ]
+      EventArgs: [ EventArgs, EventArgs$, null ],
+      Button: [ Button, Button$, null ],
+      App: [ App, App$, null ]
     });
 
-  Basic$EventArgs.Empty = new Basic$EventArgs();
+  EventArgs.Empty = new EventArgs();
 
   return $exports;
 });
diff --git a/tests/TestCases/Basic/Simple/DefaultBaseline.txt b/tests/TestCases/Basic/Simple/DefaultBaseline.txt
index a25866946..ab0d33b05 100644
--- a/tests/TestCases/Basic/Simple/DefaultBaseline.txt
+++ b/tests/TestCases/Basic/Simple/DefaultBaseline.txt
@@ -5,19 +5,19 @@ define('basic', ['ss'], function(ss) {
 
   // Basic.EventArgs
 
-  function Basic$EventArgs() {
+  function EventArgs() {
   }
-  var Basic$EventArgs$ = {
+  var EventArgs$ = {
 
   };
 
 
   // Basic.Button
 
-  function Basic$Button(text) {
+  function Button(text) {
     this._text = text;
   }
-  var Basic$Button$ = {
+  var Button$ = {
     add_click: function(value) {
       this.__click = ss.bindAdd(this.__click, value);
     },
@@ -29,7 +29,7 @@ define('basic', ['ss'], function(ss) {
     },
     performClick: function() {
       if (this.__click != null) {
-        this.__click(this, Basic$EventArgs.Empty);
+        this.__click(this, EventArgs.Empty);
       }
     }
   };
@@ -37,19 +37,19 @@ define('basic', ['ss'], function(ss) {
 
   // Basic.App
 
-  function Basic$App() {
-    this._btn1 = new Basic$Button('OK');
+  function App() {
+    this._btn1 = new Button('OK');
     this._btn1.add_click(ss.bind('_onClickButton', this));
     this._btn1.add_click(ss.bind('_onClickButtonDup', this));
-    this._btn2 = new Basic$Button('Cancel');
+    this._btn2 = new Button('Cancel');
     this._btn2.add_click(ss.bind('_onClickButton', this));
   }
-  Basic$App.main = function(args) {
-    var theApp = new Basic$App();
+  App.main = function(args) {
+    var theApp = new App();
     theApp._btn1.performClick();
     theApp._btn2.performClick();
-  }
-  var Basic$App$ = {
+  };
+  var App$ = {
     _echo: function(s) {
     },
     _onClickButton: function(sender, e) {
@@ -63,12 +63,12 @@ define('basic', ['ss'], function(ss) {
 
   var $exports = ss.module('basic', null,
     {
-      EventArgs: [ Basic$EventArgs, Basic$EventArgs$, null ],
-      Button: [ Basic$Button, Basic$Button$, null ],
-      App: [ Basic$App, Basic$App$, null ]
+      EventArgs: [ EventArgs, EventArgs$, null ],
+      Button: [ Button, Button$, null ],
+      App: [ App, App$, null ]
     });
 
-  Basic$EventArgs.Empty = new Basic$EventArgs();
+  EventArgs.Empty = new EventArgs();
 
   return $exports;
 });
diff --git a/tests/TestCases/Basic/Simple/SimpleBaseline.txt b/tests/TestCases/Basic/Simple/SimpleBaseline.txt
index 3fbd2ca8d..68ee0124f 100644
--- a/tests/TestCases/Basic/Simple/SimpleBaseline.txt
+++ b/tests/TestCases/Basic/Simple/SimpleBaseline.txt
@@ -3,23 +3,23 @@
 "use strict";
 
 (function($global) {
-  var ss = require('ss');
+  var ss = require('scriptsharp');
 
   // Basic.EventArgs
 
-  function Basic$EventArgs() {
+  function EventArgs() {
   }
-  var Basic$EventArgs$ = {
+  var EventArgs$ = {
 
   };
 
 
   // Basic.Button
 
-  function Basic$Button(text) {
+  function Button(text) {
     this._text = text;
   }
-  var Basic$Button$ = {
+  var Button$ = {
     add_click: function(value) {
       this.__click = ss.bindAdd(this.__click, value);
     },
@@ -31,7 +31,7 @@
     },
     performClick: function() {
       if (this.__click != null) {
-        this.__click(this, Basic$EventArgs.Empty);
+        this.__click(this, EventArgs.Empty);
       }
     }
   };
@@ -39,19 +39,19 @@
 
   // Basic.App
 
-  function Basic$App() {
-    this._btn1 = new Basic$Button('OK');
+  function App() {
+    this._btn1 = new Button('OK');
     this._btn1.add_click(ss.bind('_onClickButton', this));
     this._btn1.add_click(ss.bind('_onClickButtonDup', this));
-    this._btn2 = new Basic$Button('Cancel');
+    this._btn2 = new Button('Cancel');
     this._btn2.add_click(ss.bind('_onClickButton', this));
   }
-  Basic$App.main = function(args) {
-    var theApp = new Basic$App();
+  App.main = function(args) {
+    var theApp = new App();
     theApp._btn1.performClick();
     theApp._btn2.performClick();
-  }
-  var Basic$App$ = {
+  };
+  var App$ = {
     _echo: function(s) {
     },
     _onClickButton: function(sender, e) {
@@ -65,12 +65,12 @@
 
   var $exports = ss.module('basic', null,
     {
-      EventArgs: [ Basic$EventArgs, Basic$EventArgs$, null ],
-      Button: [ Basic$Button, Basic$Button$, null ],
-      App: [ Basic$App, Basic$App$, null ]
+      EventArgs: [ EventArgs, EventArgs$, null ],
+      Button: [ Button, Button$, null ],
+      App: [ App, App$, null ]
     });
 
-  Basic$EventArgs.Empty = new Basic$EventArgs();
+  EventArgs.Empty = new EventArgs();
 
   return $exports;
 })(this);
diff --git a/tests/TestCases/Basic/UnitTest/NonTestBaseline.txt b/tests/TestCases/Basic/UnitTest/NonTestBaseline.txt
index 6252f54ad..08a4dbc1a 100644
--- a/tests/TestCases/Basic/UnitTest/NonTestBaseline.txt
+++ b/tests/TestCases/Basic/UnitTest/NonTestBaseline.txt
@@ -5,9 +5,9 @@ define('test', ['ss'], function(ss) {
 
   // BasicTests.PublicClass
 
-  function BasicTests$PublicClass() {
+  function PublicClass() {
   }
-  var BasicTests$PublicClass$ = {
+  var PublicClass$ = {
     format: function(i) {
       return '0';
     },
@@ -19,9 +19,9 @@ define('test', ['ss'], function(ss) {
 
   // BasicTests.InternalClass
 
-  function BasicTests$InternalClass() {
+  function InternalClass() {
   }
-  var BasicTests$InternalClass$ = {
+  var InternalClass$ = {
     format: function(i) {
       return null;
     },
@@ -33,10 +33,10 @@ define('test', ['ss'], function(ss) {
 
   var $exports = ss.module('test',
     {
-      InternalClass: [ BasicTests$InternalClass, BasicTests$InternalClass$, null ]
+      InternalClass: [ InternalClass, InternalClass$, null ]
     },
     {
-      PublicClass: [ BasicTests$PublicClass, BasicTests$PublicClass$, null ]
+      PublicClass: [ PublicClass, PublicClass$, null ]
     });
 
 
diff --git a/tests/TestCases/Basic/UnitTest/TestBaseline.txt b/tests/TestCases/Basic/UnitTest/TestBaseline.txt
index 5171f2e11..62aa4ea5f 100644
--- a/tests/TestCases/Basic/UnitTest/TestBaseline.txt
+++ b/tests/TestCases/Basic/UnitTest/TestBaseline.txt
@@ -5,9 +5,9 @@ define('test', ['ss'], function(ss) {
 
   // BasicTests.PublicClass
 
-  function BasicTests$PublicClass() {
+  function PublicClass() {
   }
-  var BasicTests$PublicClass$ = {
+  var PublicClass$ = {
     format: function(i) {
       return '0';
     },
@@ -19,9 +19,9 @@ define('test', ['ss'], function(ss) {
 
   // BasicTests.InternalClass
 
-  function BasicTests$InternalClass() {
+  function InternalClass() {
   }
-  var BasicTests$InternalClass$ = {
+  var InternalClass$ = {
     format: function(i) {
       return null;
     },
@@ -33,21 +33,21 @@ define('test', ['ss'], function(ss) {
 
   // BasicTests.Tests.Helpers.Foo
 
-  function BasicTests$Tests$Helpers$Foo() {
+  function Foo() {
   }
-  var BasicTests$Tests$Helpers$Foo$ = {
+  var Foo$ = {
 
   };
 
 
   // BasicTests.Tests.PublicTests
 
-  function BasicTests$Tests$PublicTests() {
+  function PublicTests() {
   }
-  var BasicTests$Tests$PublicTests$ = {
+  var PublicTests$ = {
     testFormat: function() {
       QUnit.expect(1);
-      var testee = new BasicTests$PublicClass();
+      var testee = new PublicClass();
       var s = testee.format(0);
       QUnit.equal(s, '0', "Expected '0' for result.");
     }
@@ -56,18 +56,18 @@ define('test', ['ss'], function(ss) {
 
   // BasicTests.Tests.InternalTests
 
-  function BasicTests$Tests$InternalTests() {
+  function InternalTests() {
   }
-  var BasicTests$Tests$InternalTests$ = {
+  var InternalTests$ = {
     testFormat: function() {
       QUnit.expect(1);
-      var testee = new BasicTests$InternalClass();
+      var testee = new InternalClass();
       var s = testee.format(0);
       QUnit.equal(s, '0', "Expected '0' for result.");
     },
     testParse: function() {
       QUnit.expect(1);
-      var testee = new BasicTests$InternalClass();
+      var testee = new InternalClass();
       var i = testee.parse('0');
       QUnit.equal(i, 0, 'Expected 0 for result.');
     },
@@ -82,19 +82,19 @@ define('test', ['ss'], function(ss) {
 
   var $exports = ss.module('test',
     {
-      InternalClass: [ BasicTests$InternalClass, BasicTests$InternalClass$, null ],
-      Foo: [ BasicTests$Tests$Helpers$Foo, BasicTests$Tests$Helpers$Foo$, null ],
-      PublicTests: [ BasicTests$Tests$PublicTests, BasicTests$Tests$PublicTests$, null ],
-      InternalTests: [ BasicTests$Tests$InternalTests, BasicTests$Tests$InternalTests$, null ]
+      InternalClass: [ InternalClass, InternalClass$, null ],
+      Foo: [ Foo, Foo$, null ],
+      PublicTests: [ PublicTests, PublicTests$, null ],
+      InternalTests: [ InternalTests, InternalTests$, null ]
     },
     {
-      PublicClass: [ BasicTests$PublicClass, BasicTests$PublicClass$, null ]
+      PublicClass: [ PublicClass, PublicClass$, null ]
     });
 
 
   module('PublicTests', {
     setup: function() {
-      this.instance = new BasicTests$Tests$PublicTests();
+      this.instance = new PublicTests();
     },
     teardown: function() {
       delete this.instance;
@@ -107,7 +107,7 @@ define('test', ['ss'], function(ss) {
 
   module('InternalTests', {
     setup: function() {
-      this.instance = new BasicTests$Tests$InternalTests();
+      this.instance = new InternalTests();
       this.instance.setup();
     },
     teardown: function() {
diff --git a/tests/TestCases/Expression/AnonymousMethods/Baseline.txt b/tests/TestCases/Expression/AnonymousMethods/Baseline.txt
index 9fd11df1b..479781c8d 100644
--- a/tests/TestCases/Expression/AnonymousMethods/Baseline.txt
+++ b/tests/TestCases/Expression/AnonymousMethods/Baseline.txt
@@ -5,31 +5,31 @@ define('test', ['ss'], function(ss) {
 
   // ExpressionTests.SomeClass
 
-  function ExpressionTests$SomeClass(cb) {
+  function SomeClass(cb) {
   }
-  var ExpressionTests$SomeClass$ = {
+  var SomeClass$ = {
 
   };
 
 
   // ExpressionTests.Test
 
-  function ExpressionTests$Test() {
+  function Test() {
     this._n = 0;
   }
-  ExpressionTests$Test.main = function(args) {
+  Test.main = function(args) {
     var o = {};
     var name;
-    ExpressionTests$Test.doStuffStatic(o, function(i, s, b) {
+    Test.doStuffStatic(o, function(i, s, b) {
       name = s;
     });
-  }
-  ExpressionTests$Test.doStuffStatic = function(o, callback) {
-    var s = new ExpressionTests$SomeClass(function() {
+  };
+  Test.doStuffStatic = function(o, callback) {
+    var s = new SomeClass(function() {
       var temp = o;
     });
-  }
-  var ExpressionTests$Test$ = {
+  };
+  var Test$ = {
     AAA: function() {
       var $this = this;
 
@@ -37,7 +37,7 @@ define('test', ['ss'], function(ss) {
       this.doStuff(o, function(i, s, b) {
         $this._n = i;
       });
-      var s = new ExpressionTests$SomeClass(function() {
+      var s = new SomeClass(function() {
       });
       for (var i = 0; i < 10; i++) {
         var foo;
@@ -47,17 +47,17 @@ define('test', ['ss'], function(ss) {
         this.doStuff(o, function(i, s, b) {
           $this._n += i;
         });
-        ExpressionTests$Test.doStuffStatic(o, function() {
+        Test.doStuffStatic(o, function() {
         });
-        ExpressionTests$Test.doStuffStatic(o, function() {
+        Test.doStuffStatic(o, function() {
           $this._n++;
         });
       }
-      var s2 = new ExpressionTests$SomeClass(function() {
+      var s2 = new SomeClass(function() {
         var numbers = [ $this._n ];
       });
-      var s3 = new ExpressionTests$SomeClass(function() {
-        var s4 = new ExpressionTests$SomeClass(function() {
+      var s3 = new SomeClass(function() {
+        var s4 = new SomeClass(function() {
           var numbers = [ $this._n * 2 ];
         });
       });
@@ -84,15 +84,15 @@ define('test', ['ss'], function(ss) {
       })(3);
     },
     BBB: function(o) {
-      var s = new ExpressionTests$SomeClass(function() {
+      var s = new SomeClass(function() {
         var temp = o;
       });
     },
     CCC: function(o) {
       var $this = this;
 
-      var s = new ExpressionTests$SomeClass(function() {
-        var s = new ExpressionTests$SomeClass(function() {
+      var s = new SomeClass(function() {
+        var s = new SomeClass(function() {
           var numbers = [ $this._n * 2 ];
         });
       });
@@ -104,8 +104,8 @@ define('test', ['ss'], function(ss) {
 
   var $exports = ss.module('test', null,
     {
-      SomeClass: [ ExpressionTests$SomeClass, ExpressionTests$SomeClass$, null ],
-      Test: [ ExpressionTests$Test, ExpressionTests$Test$, null ]
+      SomeClass: [ SomeClass, SomeClass$, null ],
+      Test: [ Test, Test$, null ]
     });
 
 
diff --git a/tests/TestCases/Expression/Arguments/Baseline.txt b/tests/TestCases/Expression/Arguments/Baseline.txt
index e01f17958..81da848c6 100644
--- a/tests/TestCases/Expression/Arguments/Baseline.txt
+++ b/tests/TestCases/Expression/Arguments/Baseline.txt
@@ -5,9 +5,9 @@ define('test', ['ss'], function(ss) {
 
   // ExpressionTests.App
 
-  function ExpressionTests$App() {
+  function App() {
   }
-  var ExpressionTests$App$ = {
+  var App$ = {
     test: function(arg) {
       var count = arguments.length;
       var value = arguments[0];
@@ -18,7 +18,7 @@ define('test', ['ss'], function(ss) {
 
   var $exports = ss.module('test', null,
     {
-      App: [ ExpressionTests$App, ExpressionTests$App$, null ]
+      App: [ App, App$, null ]
     });
 
 
diff --git a/tests/TestCases/Expression/Array/Baseline.txt b/tests/TestCases/Expression/Array/Baseline.txt
index f9c354c38..cdf86987e 100644
--- a/tests/TestCases/Expression/Array/Baseline.txt
+++ b/tests/TestCases/Expression/Array/Baseline.txt
@@ -5,9 +5,9 @@ define('test', ['ss'], function(ss) {
 
   // ExpressionTests.App
 
-  function ExpressionTests$App() {
+  function App() {
   }
-  var ExpressionTests$App$ = {
+  var App$ = {
     test: function(arg) {
       var items = [];
       items.push(1);
@@ -44,7 +44,7 @@ define('test', ['ss'], function(ss) {
 
   var $exports = ss.module('test', null,
     {
-      App: [ ExpressionTests$App, ExpressionTests$App$, null ]
+      App: [ App, App$, null ]
     });
 
 
diff --git a/tests/TestCases/Expression/Base/Baseline.txt b/tests/TestCases/Expression/Base/Baseline.txt
index f1368ffbf..8c8ee0fd1 100644
--- a/tests/TestCases/Expression/Base/Baseline.txt
+++ b/tests/TestCases/Expression/Base/Baseline.txt
@@ -5,9 +5,9 @@ define('test', ['ss'], function(ss) {
 
   // ExpressionTests.Foo
 
-  function ExpressionTests$Foo(i, j) {
+  function Foo(i, j) {
   }
-  var ExpressionTests$Foo$ = {
+  var Foo$ = {
     toString: function() {
       return 'Foo';
     },
@@ -19,23 +19,23 @@ define('test', ['ss'], function(ss) {
 
   // ExpressionTests.Bar
 
-  function ExpressionTests$Bar(i, j, f) {
-    ExpressionTests$Foo.call(this, i, j);
+  function Bar(i, j, f) {
+    Foo.call(this, i, j);
   }
-  var ExpressionTests$Bar$ = {
+  var Bar$ = {
     sum: function() {
-      return ss.base(this, 'sum').call(this, 1) + 1;
+      return Foo.prototype.sum.call(this, 1) + 1;
     },
     toString: function() {
-      return ss.base(this, 'toString').call(this) + ' -> Bar';
+      return Foo.prototype.toString.call(this) + ' -> Bar';
     }
   };
 
 
   var $exports = ss.module('test', null,
     {
-      Foo: [ ExpressionTests$Foo, ExpressionTests$Foo$, null ],
-      Bar: [ ExpressionTests$Bar, ExpressionTests$Bar$, ExpressionTests$Foo ]
+      Foo: [ Foo, Foo$, null ],
+      Bar: [ Bar, Bar$, Foo ]
     });
 
 
diff --git a/tests/TestCases/Expression/Binary/Baseline.txt b/tests/TestCases/Expression/Binary/Baseline.txt
index c9f09e729..262b6ad85 100644
--- a/tests/TestCases/Expression/Binary/Baseline.txt
+++ b/tests/TestCases/Expression/Binary/Baseline.txt
@@ -5,10 +5,10 @@ define('test', ['ss'], function(ss) {
 
   // ExpressionTests.Data
 
-  function ExpressionTests$Data() {
+  function Data() {
     this._value = 0;
   }
-  var ExpressionTests$Data$ = {
+  var Data$ = {
     get_value: function() {
       return this._value;
     },
@@ -27,9 +27,9 @@ define('test', ['ss'], function(ss) {
 
   // ExpressionTests.App
 
-  function ExpressionTests$App() {
+  function App() {
   }
-  var ExpressionTests$App$ = {
+  var App$ = {
     get__foo: function() {
       return 0;
     },
@@ -43,7 +43,7 @@ define('test', ['ss'], function(ss) {
       return value;
     },
     get_data: function() {
-      return new ExpressionTests$Data();
+      return new Data();
     },
     set_data: function(value) {
       return value;
@@ -52,7 +52,7 @@ define('test', ['ss'], function(ss) {
       return this.get_data().get_flag();
     },
     get_flag2: function() {
-      return ExpressionTests$Data.staticFlag;
+      return Data.staticFlag;
     },
     test: function(arg1, arg2) {
       var sum = arg1 + arg2;
@@ -82,10 +82,10 @@ define('test', ['ss'], function(ss) {
       abc = xyz >>> 2;
       abc <<= 1;
       xyz >>>= 1;
-      var d = new ExpressionTests$Data();
+      var d = new Data();
       d.set_value(d.get_value() + 5);
       d.set_flag((d.get_flag() | true) === 1);
-      var o1 = null || {};
+      var o1 = ss.value(null, {});
       var s2 = (10).toString();
       s2 = (100).toString();
       s2 = true.toString();
@@ -100,7 +100,7 @@ define('test', ['ss'], function(ss) {
       b = (b | true) === 1;
       c = (c ^ true) === 1;
       a = (a | (a || a)) === 1;
-      var d = new ExpressionTests$Data();
+      var d = new 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);
@@ -110,11 +110,11 @@ define('test', ['ss'], function(ss) {
 
   var $exports = ss.module('test', null,
     {
-      Data: [ ExpressionTests$Data, ExpressionTests$Data$, null ],
-      App: [ ExpressionTests$App, ExpressionTests$App$, null ]
+      Data: [ Data, Data$, null ],
+      App: [ App, App$, null ]
     });
 
-  ExpressionTests$Data.staticFlag = false;
+  Data.staticFlag = false;
 
   return $exports;
 });
diff --git a/tests/TestCases/Expression/Cast/Baseline.txt b/tests/TestCases/Expression/Cast/Baseline.txt
index 1cb790639..db2245d2e 100644
--- a/tests/TestCases/Expression/Cast/Baseline.txt
+++ b/tests/TestCases/Expression/Cast/Baseline.txt
@@ -5,9 +5,9 @@ define('test', ['ss'], function(ss) {
 
   // ExpressionTests.App
 
-  function ExpressionTests$App() {
+  function App() {
   }
-  var ExpressionTests$App$ = {
+  var App$ = {
     test: function(arg) {
       var f = arg / 2;
       var d = 0.25;
@@ -37,7 +37,7 @@ define('test', ['ss'], function(ss) {
 
   var $exports = ss.module('test', null,
     {
-      App: [ ExpressionTests$App, ExpressionTests$App$, null ]
+      App: [ App, App$, null ]
     });
 
 
diff --git a/tests/TestCases/Expression/Conditional/Baseline.txt b/tests/TestCases/Expression/Conditional/Baseline.txt
index 81077fbbf..e98010881 100644
--- a/tests/TestCases/Expression/Conditional/Baseline.txt
+++ b/tests/TestCases/Expression/Conditional/Baseline.txt
@@ -5,9 +5,9 @@ define('test', ['ss'], function(ss) {
 
   // ExpressionTests.App
 
-  function ExpressionTests$App() {
+  function App() {
   }
-  var ExpressionTests$App$ = {
+  var App$ = {
     test: function(arg) {
       var b = (!arg) ? true : false;
       b = (!arg) ? true : false;
@@ -21,7 +21,7 @@ define('test', ['ss'], function(ss) {
 
   var $exports = ss.module('test', null,
     {
-      App: [ ExpressionTests$App, ExpressionTests$App$, null ]
+      App: [ App, App$, null ]
     });
 
 
diff --git a/tests/TestCases/Expression/Date/Baseline.txt b/tests/TestCases/Expression/Date/Baseline.txt
index 3274221d2..b05e61462 100644
--- a/tests/TestCases/Expression/Date/Baseline.txt
+++ b/tests/TestCases/Expression/Date/Baseline.txt
@@ -5,9 +5,9 @@ define('test', ['ss'], function(ss) {
 
   // ExpressionTests.App
 
-  function ExpressionTests$App() {
+  function App() {
   }
-  var ExpressionTests$App$ = {
+  var App$ = {
     equality: function() {
       var d1 = null;
       var d2 = null;
@@ -30,7 +30,7 @@ define('test', ['ss'], function(ss) {
 
   var $exports = ss.module('test', null,
     {
-      App: [ ExpressionTests$App, ExpressionTests$App$, null ]
+      App: [ App, App$, null ]
     });
 
 
diff --git a/tests/TestCases/Expression/Delegates/Baseline.txt b/tests/TestCases/Expression/Delegates/Baseline.txt
index 4cc63b3a1..e9a027e26 100644
--- a/tests/TestCases/Expression/Delegates/Baseline.txt
+++ b/tests/TestCases/Expression/Delegates/Baseline.txt
@@ -5,35 +5,35 @@ define('test', ['ss'], function(ss) {
 
   // ExpressionTests.EventArgs
 
-  function ExpressionTests$EventArgs() {
+  function EventArgs() {
   }
-  var ExpressionTests$EventArgs$ = {
+  var EventArgs$ = {
 
   };
 
 
   // ExpressionTests.SomeClass
 
-  function ExpressionTests$SomeClass(handler) {
+  function SomeClass(handler) {
   }
-  var ExpressionTests$SomeClass$ = {
+  var SomeClass$ = {
 
   };
 
 
   // ExpressionTests.Test
 
-  function ExpressionTests$Test() {
+  function Test() {
     this._handler = ss.bind('onEvent', this);
     this._handler = ss.bind('onEvent', this);
     this._handler = ss.bind('onEvent', this);
-    this._handler = ExpressionTests$Test2.onGlobalEvent;
-    var s1 = new ExpressionTests$SomeClass(ss.bind('onEvent', this));
-    var s2 = new ExpressionTests$SomeClass(this._handler);
+    this._handler = Test2.onGlobalEvent;
+    var s1 = new SomeClass(ss.bind('onEvent', this));
+    var s2 = new SomeClass(this._handler);
     var e = ss.bindExport(this._handler);
     e.dispose();
   }
-  var ExpressionTests$Test$ = {
+  var Test$ = {
     doStuff: function() {
       if (this._handler != null) {
         this._handler(this, null);
@@ -46,21 +46,21 @@ define('test', ['ss'], function(ss) {
 
   // ExpressionTests.Test2
 
-  function ExpressionTests$Test2() {
+  function Test2() {
   }
-  ExpressionTests$Test2.onGlobalEvent = function(sender, e) {
-  }
-  var ExpressionTests$Test2$ = {
+  Test2.onGlobalEvent = function(sender, e) {
+  };
+  var Test2$ = {
 
   };
 
 
   var $exports = ss.module('test', null,
     {
-      EventArgs: [ ExpressionTests$EventArgs, ExpressionTests$EventArgs$, null ],
-      SomeClass: [ ExpressionTests$SomeClass, ExpressionTests$SomeClass$, null ],
-      Test: [ ExpressionTests$Test, ExpressionTests$Test$, null ],
-      Test2: [ ExpressionTests$Test2, ExpressionTests$Test2$, null ]
+      EventArgs: [ EventArgs, EventArgs$, null ],
+      SomeClass: [ SomeClass, SomeClass$, null ],
+      Test: [ Test, Test$, null ],
+      Test2: [ Test2, Test2$, null ]
     });
 
 
diff --git a/tests/TestCases/Expression/Dictionary/Baseline.txt b/tests/TestCases/Expression/Dictionary/Baseline.txt
index 62d1ec8e7..905b18c97 100644
--- a/tests/TestCases/Expression/Dictionary/Baseline.txt
+++ b/tests/TestCases/Expression/Dictionary/Baseline.txt
@@ -5,9 +5,9 @@ define('test', ['ss'], function(ss) {
 
   // ExpressionTests.App
 
-  function ExpressionTests$App() {
+  function App() {
   }
-  var ExpressionTests$App$ = {
+  var App$ = {
     getData: function() {
       return null;
     },
@@ -16,7 +16,7 @@ define('test', ['ss'], function(ss) {
     },
     test: function(arg) {
       var dictionary1 = {};
-      var dictionary2 = { xyz: 1, abc: new ExpressionTests$App(), 'delete': 2, 'test.': 3, '\t': 4 };
+      var dictionary2 = { xyz: 1, abc: new App(), 'delete': 2, 'test.': 3, '\t': 4 };
     },
     test2: function(arg) {
       var dictionary1 = { aaa: 123, xyz: true };
@@ -53,7 +53,7 @@ define('test', ['ss'], function(ss) {
 
   var $exports = ss.module('test', null,
     {
-      App: [ ExpressionTests$App, ExpressionTests$App$, null ]
+      App: [ App, App$, null ]
     });
 
 
diff --git a/tests/TestCases/Expression/EnumToString/MinBaseline.txt b/tests/TestCases/Expression/EnumToString/MinBaseline.txt
index 8bb25d9ca..834d6f228 100644
--- a/tests/TestCases/Expression/EnumToString/MinBaseline.txt
+++ b/tests/TestCases/Expression/EnumToString/MinBaseline.txt
@@ -5,9 +5,9 @@ define('test', ['ss'], function(ss) {
 
   // ExpressionTests.App
 
-  function ExpressionTests$App() {
+  function App() {
   }
-  var ExpressionTests$App$ = {
+  var App$ = {
     test: function(arg) {
       var s1 = (0).toString();
       var s2 = (2).toString();
@@ -25,7 +25,7 @@ define('test', ['ss'], function(ss) {
 
   var $exports = ss.module('test', null,
     {
-      App: [ ExpressionTests$App, ExpressionTests$App$, null ]
+      App: [ App, App$, null ]
     });
 
 
diff --git a/tests/TestCases/Expression/EnumToString/NormalBaseline.txt b/tests/TestCases/Expression/EnumToString/NormalBaseline.txt
index 6d1f6e14f..b6e25ae0a 100644
--- a/tests/TestCases/Expression/EnumToString/NormalBaseline.txt
+++ b/tests/TestCases/Expression/EnumToString/NormalBaseline.txt
@@ -5,7 +5,7 @@ define('test', ['ss'], function(ss) {
 
   // ExpressionTests.Color
 
-  var ExpressionTests$Color = {
+  var Color = {
     red: 1, 
     green: 2, 
     blue: 3
@@ -14,7 +14,7 @@ define('test', ['ss'], function(ss) {
 
   // ExpressionTests.Types
 
-  var ExpressionTests$Types = {
+  var Types = {
     none: 0, 
     type1: 1, 
     type2: 2, 
@@ -24,9 +24,9 @@ define('test', ['ss'], function(ss) {
 
   // ExpressionTests.App
 
-  function ExpressionTests$App() {
+  function App() {
   }
-  var ExpressionTests$App$ = {
+  var App$ = {
     test: function(arg) {
       var s1 = (0).toString();
       var s2 = (2).toString();
@@ -44,9 +44,9 @@ define('test', ['ss'], function(ss) {
 
   var $exports = ss.module('test', null,
     {
-      Color: ExpressionTests$Color,
-      Types: ExpressionTests$Types,
-      App: [ ExpressionTests$App, ExpressionTests$App$, null ]
+      Color: Color,
+      Types: Types,
+      App: [ App, App$, null ]
     });
 
 
diff --git a/tests/TestCases/Expression/Events/Baseline.txt b/tests/TestCases/Expression/Events/Baseline.txt
index 30c40ea09..e80702901 100644
--- a/tests/TestCases/Expression/Events/Baseline.txt
+++ b/tests/TestCases/Expression/Events/Baseline.txt
@@ -5,15 +5,15 @@ define('test', ['ss'], function(ss) {
 
   // ExpressionTests.Button
 
-  function ExpressionTests$Button() {
+  function Button() {
   }
-  ExpressionTests$Button.add_test = function(value) {
-    ExpressionTests$Button.__test = ss.bindAdd(ExpressionTests$Button.__test, value);
-  }
-  ExpressionTests$Button.remove_test = function(value) {
-    ExpressionTests$Button.__test = ss.bindSub(ExpressionTests$Button.__test, value);
-  }
-  var ExpressionTests$Button$ = {
+  Button.add_test = function(value) {
+    Button.__test = ss.bindAdd(Button.__test, value);
+  };
+  Button.remove_test = function(value) {
+    Button.__test = ss.bindSub(Button.__test, value);
+  };
+  var Button$ = {
     add_click: function(value) {
       this.__click = ss.bindAdd(this.__click, value);
     },
@@ -47,19 +47,19 @@ define('test', ['ss'], function(ss) {
 
   // ExpressionTests.App
 
-  function ExpressionTests$App() {
+  function App() {
     this._btn.add_click(ss.bind('_onClickButton', this));
     this._btn.add_click(ss.bind('_onClickButton', this));
     this._btn.add_click(ss.bind('_onClickButton', this));
     this._btn.remove_click(ss.bind('_onClickButton', this));
     this._btn.remove_click(ss.bind('_onClickButton', this));
     this._btn.remove_click(ss.bind('_onClickButton', this));
-    ExpressionTests$Button.add_test(ExpressionTests$App._onTestButton);
-    ExpressionTests$Button.add_test(ExpressionTests$App._onTestButton);
-    ExpressionTests$Button.add_test(ExpressionTests$App._onTestButton);
-    ExpressionTests$Button.remove_test(ExpressionTests$App._onTestButton);
-    ExpressionTests$Button.remove_test(ExpressionTests$App._onTestButton);
-    ExpressionTests$Button.remove_test(ExpressionTests$App._onTestButton);
+    Button.add_test(App._onTestButton);
+    Button.add_test(App._onTestButton);
+    Button.add_test(App._onTestButton);
+    Button.remove_test(App._onTestButton);
+    Button.remove_test(App._onTestButton);
+    Button.remove_test(App._onTestButton);
     this._btn.add_aaa(ss.bind('_onAAAButton', this));
     this._btn.add_aaa(ss.bind('_onAAAButton', this));
     this._btn.add_aaa(ss.bind('_onAAAButton', this));
@@ -67,9 +67,9 @@ define('test', ['ss'], function(ss) {
     this._btn.remove_aaa(ss.bind('_onAAAButton', this));
     this._btn.remove_aaa(ss.bind('_onAAAButton', this));
   }
-  ExpressionTests$App._onTestButton = function(sender, e) {
-  }
-  var ExpressionTests$App$ = {
+  App._onTestButton = function(sender, e) {
+  };
+  var App$ = {
     _onAAAButton: function(sender, e) {
     },
     _onClickButton: function(sender, e) {
@@ -79,19 +79,19 @@ define('test', ['ss'], function(ss) {
 
   // ExpressionTests.FooEventArgs
 
-  function ExpressionTests$FooEventArgs() {
+  function FooEventArgs() {
     ss.EventArgs.call(this);
   }
-  var ExpressionTests$FooEventArgs$ = {
+  var FooEventArgs$ = {
 
   };
 
 
   var $exports = ss.module('test', null,
     {
-      Button: [ ExpressionTests$Button, ExpressionTests$Button$, null ],
-      App: [ ExpressionTests$App, ExpressionTests$App$, null ],
-      FooEventArgs: [ ExpressionTests$FooEventArgs, ExpressionTests$FooEventArgs$, ss.EventArgs ]
+      Button: [ Button, Button$, null ],
+      App: [ App, App$, null ],
+      FooEventArgs: [ FooEventArgs, FooEventArgs$, ss.EventArgs ]
     });
 
 
diff --git a/tests/TestCases/Expression/ExtensionMethods/Baseline.txt b/tests/TestCases/Expression/ExtensionMethods/Baseline.txt
index bb4416b76..b0bb72f1a 100644
--- a/tests/TestCases/Expression/ExtensionMethods/Baseline.txt
+++ b/tests/TestCases/Expression/ExtensionMethods/Baseline.txt
@@ -5,9 +5,9 @@ define('test', ['ss'], function(ss) {
 
   // ExpressionTests.App
 
-  function ExpressionTests$App() {
+  function App() {
   }
-  var ExpressionTests$App$ = {
+  var App$ = {
     test: function(arg) {
       eval('[ 1, 2 ]');
       $global.foo();
@@ -19,12 +19,12 @@ define('test', ['ss'], function(ss) {
   // ExpressionTests.Util
 
   $global.foo = function() {
-  }
+  };
 
 
   var $exports = ss.module('test', null,
     {
-      App: [ ExpressionTests$App, ExpressionTests$App$, null ]
+      App: [ App, App$, null ]
     });
 
 
diff --git a/tests/TestCases/Expression/Generics/Baseline.txt b/tests/TestCases/Expression/Generics/Baseline.txt
index 267daa987..a4864a0d8 100644
--- a/tests/TestCases/Expression/Generics/Baseline.txt
+++ b/tests/TestCases/Expression/Generics/Baseline.txt
@@ -5,7 +5,7 @@ define('test', ['ss', 'jquery'], function(ss, $) {
 
   // ExpressionTests.Foo
 
-  function ExpressionTests$Foo() {
+  function Foo() {
     this._numbers = [];
     var s = this._numbers[10].toString(10);
     var s2 = ss.enumerate(this._numbers).current.toString(10);
@@ -14,7 +14,7 @@ define('test', ['ss', 'jquery'], function(ss, $) {
     }, 0).toString(10);
     var s4 = encodeURIComponent(this._func(10));
     var f2 = this._func;
-    f2(11).trim();
+    ss.trim(f2(11));
     var d = {};
     var s5 = $.extend(d, d)['abc'].toString(10);
     var keys = ss.keyCount(d);
@@ -30,7 +30,7 @@ define('test', ['ss', 'jquery'], function(ss, $) {
     var f = JSON.parse(json).setup().run().cleanup();
     var name = document.getElementById('nameTB').value;
   }
-  var ExpressionTests$Foo$ = {
+  var Foo$ = {
     cleanup: function() {
       return this;
     },
@@ -45,7 +45,7 @@ define('test', ['ss', 'jquery'], function(ss, $) {
 
   var $exports = ss.module('test', null,
     {
-      Foo: [ ExpressionTests$Foo, ExpressionTests$Foo$, null ]
+      Foo: [ Foo, Foo$, null ]
     });
 
 
diff --git a/tests/TestCases/Expression/GetType/Baseline.txt b/tests/TestCases/Expression/GetType/Baseline.txt
index bfc16997e..0336236bf 100644
--- a/tests/TestCases/Expression/GetType/Baseline.txt
+++ b/tests/TestCases/Expression/GetType/Baseline.txt
@@ -5,9 +5,9 @@ define('test', ['ss'], function(ss) {
 
   // ExpressionTests.App
 
-  function ExpressionTests$App() {
+  function App() {
   }
-  var ExpressionTests$App$ = {
+  var App$ = {
     get__foo: function() {
       return 0;
     },
@@ -17,12 +17,12 @@ define('test', ['ss'], function(ss) {
       var t3 = ss.typeOf(this.get__foo());
       var t4 = ss.type('String');
       var t5 = ss.type('test.Foo');
-      var b1 = ss.canAssign((Object), ExpressionTests$App);
-      var b2 = ss.canAssign((ss.IDisposable), ExpressionTests$App);
-      var b3 = ss.canAssign(t, ExpressionTests$App);
-      var b4 = ss.instanceOf((ExpressionTests$App), new ExpressionTests$App());
-      var b5 = ss.instanceOf((ss.IDisposable), new ExpressionTests$App());
-      var b6 = ss.instanceOf(t, new ExpressionTests$App());
+      var b1 = ss.canAssign((Object), App);
+      var b2 = ss.canAssign((ss.IDisposable), App);
+      var b3 = ss.canAssign(t, App);
+      var b4 = ss.instanceOf((App), new App());
+      var b5 = ss.instanceOf((ss.IDisposable), new App());
+      var b6 = ss.instanceOf(t, new App());
       var b7 = ss.isInterface(t) || ss.isClass(t);
       var n = ss.typeName(t);
     }
@@ -31,7 +31,7 @@ define('test', ['ss'], function(ss) {
 
   var $exports = ss.module('test', null,
     {
-      App: [ ExpressionTests$App, ExpressionTests$App$, null ]
+      App: [ App, App$, null ]
     });
 
 
diff --git a/tests/TestCases/Expression/InlineScript/Baseline.txt b/tests/TestCases/Expression/InlineScript/Baseline.txt
index 2fd9dc196..937b0d70c 100644
--- a/tests/TestCases/Expression/InlineScript/Baseline.txt
+++ b/tests/TestCases/Expression/InlineScript/Baseline.txt
@@ -5,9 +5,9 @@ define('test', ['ss'], function(ss) {
 
   // ExpressionTests.App
 
-  function ExpressionTests$App() {
+  function App() {
   }
-  var ExpressionTests$App$ = {
+  var App$ = {
     test: function(arg) {
       arg + 1;
       var i = arg + 1;
@@ -21,7 +21,7 @@ define('test', ['ss'], function(ss) {
 
   var $exports = ss.module('test', null,
     {
-      App: [ ExpressionTests$App, ExpressionTests$App$, null ]
+      App: [ App, App$, null ]
     });
 
 
diff --git a/tests/TestCases/Expression/LateBound/Baseline.txt b/tests/TestCases/Expression/LateBound/Baseline.txt
index b3f1c88d2..7269be60d 100644
--- a/tests/TestCases/Expression/LateBound/Baseline.txt
+++ b/tests/TestCases/Expression/LateBound/Baseline.txt
@@ -5,9 +5,9 @@ define('test', ['ss'], function(ss) {
 
   // ExpressionTests.App
 
-  function ExpressionTests$App() {
+  function App() {
   }
-  var ExpressionTests$App$ = {
+  var App$ = {
     test: function(arg) {
       var o;
       var b;
@@ -44,7 +44,7 @@ define('test', ['ss'], function(ss) {
 
   var $exports = ss.module('test', null,
     {
-      App: [ ExpressionTests$App, ExpressionTests$App$, null ]
+      App: [ App, App$, null ]
     });
 
 
diff --git a/tests/TestCases/Expression/Literals/Baseline.txt b/tests/TestCases/Expression/Literals/Baseline.txt
index 65dcc58cd..4b322f9e4 100644
--- a/tests/TestCases/Expression/Literals/Baseline.txt
+++ b/tests/TestCases/Expression/Literals/Baseline.txt
@@ -5,9 +5,9 @@ define('test', ['ss'], function(ss) {
 
   // ExpressionTests.App
 
-  function ExpressionTests$App() {
+  function App() {
   }
-  var ExpressionTests$App$ = {
+  var App$ = {
     test: function(arg) {
       var i = 0;
       i = -1;
@@ -29,7 +29,7 @@ define('test', ['ss'], function(ss) {
       var s5 = 'abc\u00a9';
       var s6 = "abc'xyz";
       var s7 = 'abc"xyz';
-      var t = ExpressionTests$App;
+      var t = App;
       var t2 = Number;
       var t3 = Number;
       var t4 = Object;
@@ -40,7 +40,7 @@ define('test', ['ss'], function(ss) {
 
   var $exports = ss.module('test', null,
     {
-      App: [ ExpressionTests$App, ExpressionTests$App$, null ]
+      App: [ App, App$, null ]
     });
 
 
diff --git a/tests/TestCases/Expression/Locals/Baseline.txt b/tests/TestCases/Expression/Locals/Baseline.txt
index f7fb50c21..978796200 100644
--- a/tests/TestCases/Expression/Locals/Baseline.txt
+++ b/tests/TestCases/Expression/Locals/Baseline.txt
@@ -5,9 +5,9 @@ define('test', ['ss'], function(ss) {
 
   // ExpressionTests.App
 
-  function ExpressionTests$App() {
+  function App() {
   }
-  var ExpressionTests$App$ = {
+  var App$ = {
     test: function(arg) {
       var x;
       var i = x.length;
@@ -30,7 +30,7 @@ define('test', ['ss'], function(ss) {
 
   var $exports = ss.module('test', null,
     {
-      App: [ ExpressionTests$App, ExpressionTests$App$, null ]
+      App: [ App, App$, null ]
     });
 
 
diff --git a/tests/TestCases/Expression/Members/Baseline.txt b/tests/TestCases/Expression/Members/Baseline.txt
index 32b423cd9..322c8d28e 100644
--- a/tests/TestCases/Expression/Members/Baseline.txt
+++ b/tests/TestCases/Expression/Members/Baseline.txt
@@ -5,26 +5,26 @@ define('test', ['ss'], function(ss) {
 
   // ExpressionTests.IFoo
 
-  function ExpressionTests$IFoo() { }
+  function IFoo() { }
 
 
   // ExpressionTests.BApp
 
-  function ExpressionTests$BApp() {
+  function BApp() {
   }
-  var ExpressionTests$BApp$ = {
+  var BApp$ = {
 
   };
 
 
   // ExpressionTests.App
 
-  function ExpressionTests$App() {
+  function App() {
     this._value$1 = 0;
     this._value2 = 0;
-    ExpressionTests$BApp.call(this);
+    BApp.call(this);
   }
-  var ExpressionTests$App$ = {
+  var App$ = {
     get_XYZ: function() {
       return 1;
     },
@@ -47,8 +47,8 @@ define('test', ['ss'], function(ss) {
       n = this._value$1;
       this._value$1 = n;
       this._value$1 = n;
-      n = ExpressionTests$App._myDefault$1;
-      n = ExpressionTests$App._myDefault$1;
+      n = App._myDefault$1;
+      n = App._myDefault$1;
       n = 3;
       n = 3;
       n = 3;
@@ -60,22 +60,22 @@ define('test', ['ss'], function(ss) {
 
   // ExpressionTests.DApp
 
-  function ExpressionTests$DApp() {
-    ExpressionTests$App.call(this);
+  function DApp() {
+    App.call(this);
   }
-  var ExpressionTests$DApp$ = {
+  var DApp$ = {
     test2: function() {
       var n = this.get_XYZ();
       n = this.get_XYZ();
-      n = ExpressionTests$App$.get_XYZ.call(this);
+      n = App.prototype.get_XYZ.call(this);
       this.set_XYZ(n);
       this.set_XYZ(n);
-      ss.base(this, 'set_XYZ').call(this, n);
+      App.prototype.set_XYZ.call(this, n);
       this._value2 = n;
       this._value2 = n;
       this._value2 = n;
-      n = ExpressionTests$App.myDefault2;
-      n = ExpressionTests$App.myDefault2;
+      n = App.myDefault2;
+      n = App.myDefault2;
       n = 3;
       n = 3;
       n = 3;
@@ -97,16 +97,16 @@ define('test', ['ss'], function(ss) {
 
   var $exports = ss.module('test', null,
     {
-      IFoo: [ ExpressionTests$IFoo ],
-      BApp: [ ExpressionTests$BApp, ExpressionTests$BApp$, null ],
-      App: [ ExpressionTests$App, ExpressionTests$App$, ExpressionTests$BApp ],
-      DApp: [ ExpressionTests$DApp, ExpressionTests$DApp$, ExpressionTests$App ]
+      IFoo: [ IFoo ],
+      BApp: [ BApp, BApp$, null ],
+      App: [ App, App$, BApp ],
+      DApp: [ DApp, DApp$, App ]
     });
 
-  ExpressionTests$BApp.myConstant = 3;
-  ExpressionTests$App.myConstant2 = 3;
-  ExpressionTests$App._myDefault$1 = 1;
-  ExpressionTests$App.myDefault2 = 2;
+  BApp.myConstant = 3;
+  App.myConstant2 = 3;
+  App._myDefault$1 = 1;
+  App.myDefault2 = 2;
 
   return $exports;
 });
diff --git a/tests/TestCases/Expression/New/Baseline.txt b/tests/TestCases/Expression/New/Baseline.txt
index c0dd2d246..5cb1a5607 100644
--- a/tests/TestCases/Expression/New/Baseline.txt
+++ b/tests/TestCases/Expression/New/Baseline.txt
@@ -5,7 +5,7 @@ define('test', ['ss'], function(ss) {
 
   // ExpressionTests.Point
 
-  function ExpressionTests$Point(x, y) {
+  function Point(x, y) {
     var $o = {};
     $o._x = x;
     $o._y = y;
@@ -15,30 +15,30 @@ define('test', ['ss'], function(ss) {
 
   // ExpressionTests.Foo
 
-  function ExpressionTests$Foo(i, j) {
+  function Foo(i, j) {
   }
-  var ExpressionTests$Foo$ = {
+  var Foo$ = {
 
   };
 
 
   // ExpressionTests.Bar
 
-  function ExpressionTests$Bar(i, j, f) {
+  function Bar(i, j, f) {
   }
-  var ExpressionTests$Bar$ = {
+  var Bar$ = {
 
   };
 
 
   // ExpressionTests.Test
 
-  function ExpressionTests$Test() {
+  function Test() {
   }
-  ExpressionTests$Test.main = function() {
-    var f = new ExpressionTests$Foo(0, 1);
-    var b = new ExpressionTests$Bar(0, 1, new ExpressionTests$Foo(0, 1));
-    var t = new ExpressionTests$Test();
+  Test.main = function() {
+    var f = new Foo(0, 1);
+    var b = new Bar(0, 1, new Foo(0, 1));
+    var t = new Test();
     var d = new Date('3/9/1976');
     var items = [];
     var items2 = [ 1, 2 ];
@@ -49,28 +49,28 @@ define('test', ['ss'], function(ss) {
     var list3 = ['abc', 'def', 'ghi'];
     var list4 = [1, 2, 3];
     var dates = [ new Date('1/1/2006'), new Date('1/1/2005') ];
-    var p = ExpressionTests$Point(0, 0);
+    var p = Point(0, 0);
     var cd = {};
     var cd2 = { abc: 123, def: true };
-    var o1 = new ExpressionTests$Test();
-    var type1 = ExpressionTests$Foo;
+    var o1 = new Test();
+    var type1 = Foo;
     var o2 = new type1(1, 2);
-    var o3 = new ExpressionTests$Bar(1, 2, o2);
+    var o3 = new 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 + '!');");
-  }
-  var ExpressionTests$Test$ = {
+  };
+  var Test$ = {
 
   };
 
 
   var $exports = ss.module('test', null,
     {
-      Point: ExpressionTests$Point,
-      Foo: [ ExpressionTests$Foo, ExpressionTests$Foo$, null ],
-      Bar: [ ExpressionTests$Bar, ExpressionTests$Bar$, null ],
-      Test: [ ExpressionTests$Test, ExpressionTests$Test$, null ]
+      Point: Point,
+      Foo: [ Foo, Foo$, null ],
+      Bar: [ Bar, Bar$, null ],
+      Test: [ Test, Test$, null ]
     });
 
 
diff --git a/tests/TestCases/Expression/Number/Baseline.txt b/tests/TestCases/Expression/Number/Baseline.txt
index fcba4cfec..08cbeb142 100644
--- a/tests/TestCases/Expression/Number/Baseline.txt
+++ b/tests/TestCases/Expression/Number/Baseline.txt
@@ -5,9 +5,9 @@ define('test', ['ss'], function(ss) {
 
   // ExpressionTests.App
 
-  function ExpressionTests$App() {
+  function App() {
   }
-  var ExpressionTests$App$ = {
+  var App$ = {
     test: function(arg) {
       var i = parseInt('5');
       var f = parseFloat('5.3');
@@ -19,7 +19,7 @@ define('test', ['ss'], function(ss) {
 
   var $exports = ss.module('test', null,
     {
-      App: [ ExpressionTests$App, ExpressionTests$App$, null ]
+      App: [ App, App$, null ]
     });
 
 
diff --git a/tests/TestCases/Expression/Script/Baseline.txt b/tests/TestCases/Expression/Script/Baseline.txt
index 5508d0084..05f51928e 100644
--- a/tests/TestCases/Expression/Script/Baseline.txt
+++ b/tests/TestCases/Expression/Script/Baseline.txt
@@ -5,9 +5,9 @@ define('test', ['ss'], function(ss) {
 
   // ExpressionTests.App
 
-  function ExpressionTests$App() {
+  function App() {
   }
-  var ExpressionTests$App$ = {
+  var App$ = {
     test: function(arg) {
       arg = (arg || 10);
       arg = (arg || 10 || 100);
@@ -25,6 +25,13 @@ define('test', ['ss'], function(ss) {
       b = (i === null);
       b = (i === undefined);
       b = ss.isValue(i);
+      b = isNaN(0);
+      b = isFinite(3);
+      b = !!(0);
+      b = !!b;
+      b = !!(b && b);
+      b = !(1);
+      b = !(b && b);
       var addition = eval('2 + 2');
       addition = 2 + 2;
       addition = 2 + 3;
@@ -37,7 +44,7 @@ define('test', ['ss'], function(ss) {
 
   var $exports = ss.module('test', null,
     {
-      App: [ ExpressionTests$App, ExpressionTests$App$, null ]
+      App: [ App, App$, null ]
     });
 
 
diff --git a/tests/TestCases/Expression/Script/Code.cs b/tests/TestCases/Expression/Script/Code.cs
index 330846ace..6e7ca1502 100644
--- a/tests/TestCases/Expression/Script/Code.cs
+++ b/tests/TestCases/Expression/Script/Code.cs
@@ -8,9 +8,9 @@ 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).ToString(10);
+            arg = Script.Or(arg, 10);
+            arg = Script.Or(arg, 10, 100);
+            string s = Script.Or(arg, 10).ToString(10);
             bool b = Script.Boolean(arg);
 
             StringBuilder sb = (StringBuilder)Script.CreateInstance(typeof(StringBuilder));
@@ -27,6 +27,13 @@ public void Test(int arg) {
             b = Script.IsNull(i);
             b = Script.IsUndefined(i);
             b = Script.IsValue(i);
+            b = Script.IsNaN(0);
+            b = Script.IsFinite(3);
+            b = Script.IsTruthy(0);
+            b = Script.IsTruthy(b);
+            b = Script.IsTruthy(b && b);
+            b = Script.IsFalsey(1);
+            b = Script.IsFalsey(b && b);
 
             int addition = (int)Script.Eval("2 + 2");
 
diff --git a/tests/TestCases/Expression/String/Baseline.txt b/tests/TestCases/Expression/String/Baseline.txt
index 5a69d64d9..33c486c21 100644
--- a/tests/TestCases/Expression/String/Baseline.txt
+++ b/tests/TestCases/Expression/String/Baseline.txt
@@ -5,9 +5,9 @@ define('test', ['ss'], function(ss) {
 
   // ExpressionTests.App
 
-  function ExpressionTests$App() {
+  function App() {
   }
-  var ExpressionTests$App$ = {
+  var App$ = {
     test: function(arg) {
       var s = 'Hello';
       var s2;
@@ -23,7 +23,7 @@ define('test', ['ss'], function(ss) {
 
   var $exports = ss.module('test', null,
     {
-      App: [ ExpressionTests$App, ExpressionTests$App$, null ]
+      App: [ App, App$, null ]
     });
 
 
diff --git a/tests/TestCases/Expression/Tasks/Baseline.txt b/tests/TestCases/Expression/Tasks/Baseline.txt
index beac50856..2fe114b6c 100644
--- a/tests/TestCases/Expression/Tasks/Baseline.txt
+++ b/tests/TestCases/Expression/Tasks/Baseline.txt
@@ -5,20 +5,20 @@ define('test', ['ss'], function(ss) {
 
   // ExpressionTests.Test
 
-  function ExpressionTests$Test() {
+  function Test() {
     var deferredObject = ss.deferred();
     var deferredNumber = ss.deferred();
     var availabledNumber = ss.deferred(10);
     deferredNumber.reject();
   }
-  var ExpressionTests$Test$ = {
+  var Test$ = {
 
   };
 
 
   var $exports = ss.module('test', null,
     {
-      Test: [ ExpressionTests$Test, ExpressionTests$Test$, null ]
+      Test: [ Test, Test$, null ]
     });
 
 
diff --git a/tests/TestCases/Expression/Truthy/Baseline.txt b/tests/TestCases/Expression/Truthy/Baseline.txt
index 46b3e8d4e..64c50fda3 100644
--- a/tests/TestCases/Expression/Truthy/Baseline.txt
+++ b/tests/TestCases/Expression/Truthy/Baseline.txt
@@ -5,9 +5,9 @@ define('test', ['ss'], function(ss) {
 
   // ExpressionTests.App
 
-  function ExpressionTests$App() {
+  function App() {
   }
-  var ExpressionTests$App$ = {
+  var App$ = {
     test: function(arg) {
       var i;
       var j;
@@ -64,7 +64,7 @@ define('test', ['ss'], function(ss) {
 
   var $exports = ss.module('test', null,
     {
-      App: [ ExpressionTests$App, ExpressionTests$App$, null ]
+      App: [ App, App$, null ]
     });
 
 
diff --git a/tests/TestCases/Expression/Tuples/Baseline.txt b/tests/TestCases/Expression/Tuples/Baseline.txt
index 2a2d930a4..6bd5cdd9f 100644
--- a/tests/TestCases/Expression/Tuples/Baseline.txt
+++ b/tests/TestCases/Expression/Tuples/Baseline.txt
@@ -5,9 +5,9 @@ define('test', ['ss'], function(ss) {
 
   // ExpressionTests.App
 
-  function ExpressionTests$App() {
+  function App() {
   }
-  var ExpressionTests$App$ = {
+  var App$ = {
     test: function(arg) {
       var t1 = { };
       var t2 = { item1: 1, item2: 2 };
@@ -19,7 +19,7 @@ define('test', ['ss'], function(ss) {
 
   var $exports = ss.module('test', null,
     {
-      App: [ ExpressionTests$App, ExpressionTests$App$, null ]
+      App: [ App, App$, null ]
     });
 
 
diff --git a/tests/TestCases/Expression/Unary/Baseline.txt b/tests/TestCases/Expression/Unary/Baseline.txt
index 289c716a0..d79bb4404 100644
--- a/tests/TestCases/Expression/Unary/Baseline.txt
+++ b/tests/TestCases/Expression/Unary/Baseline.txt
@@ -5,10 +5,10 @@ define('test', ['ss'], function(ss) {
 
   // ExpressionTests.Data
 
-  function ExpressionTests$Data() {
+  function Data() {
     this._value = 0;
   }
-  var ExpressionTests$Data$ = {
+  var Data$ = {
     get_value: function() {
       return this._value;
     },
@@ -21,9 +21,9 @@ define('test', ['ss'], function(ss) {
 
   // ExpressionTests.App
 
-  function ExpressionTests$App() {
+  function App() {
   }
-  var ExpressionTests$App$ = {
+  var App$ = {
     test: function(arg) {
       var xyz = ~arg;
       var f = (!arg);
@@ -40,7 +40,7 @@ define('test', ['ss'], function(ss) {
       var s = (!f).toString();
       var num = 1.01;
       s = (~num).toExponential();
-      var d = new ExpressionTests$Data();
+      var d = new Data();
       d.set_value(d.get_value() + 1) - 1;
       d.set_value(d.get_value() + 1);
     }
@@ -49,8 +49,8 @@ define('test', ['ss'], function(ss) {
 
   var $exports = ss.module('test', null,
     {
-      Data: [ ExpressionTests$Data, ExpressionTests$Data$, null ],
-      App: [ ExpressionTests$App, ExpressionTests$App$, null ]
+      Data: [ Data, Data$, null ],
+      App: [ App, App$, null ]
     });
 
 
diff --git a/tests/TestCases/Library/Node/Baseline.txt b/tests/TestCases/Library/Node/Baseline.txt
index e2be2db2b..f53bbd167 100644
--- a/tests/TestCases/Library/Node/Baseline.txt
+++ b/tests/TestCases/Library/Node/Baseline.txt
@@ -1,7 +1,7 @@
 // app.js
 //
 
-var ss = require('ss'),
+var ss = require('scriptsharp'),
     http = require('http');
 var $global = this;
 
diff --git a/tests/TestCases/Library/Node/Code.cs b/tests/TestCases/Library/Node/Code.cs
index 635421889..3a1b8641a 100644
--- a/tests/TestCases/Library/Node/Code.cs
+++ b/tests/TestCases/Library/Node/Code.cs
@@ -23,6 +23,6 @@ static App() {
             response.WriteHead(HttpStatusCode.OK,
                                new Dictionary<string, string>("Content-Type", "text/html"));
             response.End("Hello Node World, from Script#!");
-        }).Listen(Script.Value(Node.Process.Environment["port"], 8888));
+        }).Listen(Script.Or(Node.Process.Environment["port"], 8888));
     }
 }
diff --git a/tests/TestCases/Library/jQuery/Baseline.txt b/tests/TestCases/Library/jQuery/Baseline.txt
index 3ddb0a5a6..76ddc570f 100644
--- a/tests/TestCases/Library/jQuery/Baseline.txt
+++ b/tests/TestCases/Library/jQuery/Baseline.txt
@@ -15,10 +15,10 @@ define('test', ['ss', 'jquery'], function(ss, $) {
     }, error: function(xhr, textData, e) {
       console.log(xhr.status);
     } });
-  }
+  };
   MyApp.postData = function(url, data, succesCallback, errorCallback, returnType, requestType) {
-    returnType = returnType || 'text';
-    requestType = requestType || 'POST';
+    returnType = (returnType || 'text');
+    requestType = (requestType || 'POST');
     $.ajax({ cache: false, data: data, dataType: returnType, error: function(req, textStatus, error) {
       if (ss.isValue(errorCallback)) {
         errorCallback(req, textStatus, error);
@@ -31,7 +31,7 @@ define('test', ['ss', 'jquery'], function(ss, $) {
         succesCallback(dataSuccess, textStatus, request);
       }
     }, type: requestType, url: url });
-  }
+  };
   var MyApp$ = {
 
   };
diff --git a/tests/TestCases/Library/jQuery/Code.cs b/tests/TestCases/Library/jQuery/Code.cs
index e64103c26..46395d620 100644
--- a/tests/TestCases/Library/jQuery/Code.cs
+++ b/tests/TestCases/Library/jQuery/Code.cs
@@ -43,8 +43,8 @@ private static void AlertData(string url) {
     }
 
     public static void PostData(string url, object data, AjaxRequestCallback succesCallback, AjaxErrorCallback errorCallback, string returnType, string requestType) {
-        returnType = returnType ?? "text";
-        requestType = requestType ?? "POST";
+        returnType = Script.Or(returnType, "text");
+        requestType = Script.Or(requestType, "POST");
 
         jQuery.Ajax(new jQueryAjaxOptions(
             "cache", false,
diff --git a/tests/TestCases/Member/Constructors/Baseline.txt b/tests/TestCases/Member/Constructors/Baseline.txt
index 765295b1d..caeefae8c 100644
--- a/tests/TestCases/Member/Constructors/Baseline.txt
+++ b/tests/TestCases/Member/Constructors/Baseline.txt
@@ -5,53 +5,53 @@ define('test', ['ss'], function(ss) {
 
   // MemberTests.MyClass
 
-  function MemberTests$MyClass() {
+  function MyClass() {
     this._value = 0;
     this._value = 1;
   }
-  var MemberTests$MyClass$ = {
+  var MyClass$ = {
 
   };
 
 
   // MemberTests.MyClass2
 
-  function MemberTests$MyClass2() {
+  function MyClass2() {
   }
-  var MemberTests$MyClass2$ = {
+  var MyClass2$ = {
 
   };
 
 
   // MemberTests.MyClass3
 
-  function MemberTests$MyClass3(arg, arg2) {
+  function MyClass3(arg, arg2) {
   }
-  var MemberTests$MyClass3$ = {
+  var MyClass3$ = {
 
   };
 
 
   // MemberTests.MyClass4
 
-  function MemberTests$MyClass4(arg, arg2, arg3) {
-    MemberTests$MyClass3.call(this, arg, arg2);
+  function MyClass4(arg, arg2, arg3) {
+    MyClass3.call(this, arg, arg2);
   }
-  var MemberTests$MyClass4$ = {
+  var MyClass4$ = {
 
   };
 
 
   var $exports = ss.module('test', null,
     {
-      MyClass: [ MemberTests$MyClass, MemberTests$MyClass$, null ],
-      MyClass2: [ MemberTests$MyClass2, MemberTests$MyClass2$, null ],
-      MyClass3: [ MemberTests$MyClass3, MemberTests$MyClass3$, null ],
-      MyClass4: [ MemberTests$MyClass4, MemberTests$MyClass4$, MemberTests$MyClass3 ]
+      MyClass: [ MyClass, MyClass$, null ],
+      MyClass2: [ MyClass2, MyClass2$, null ],
+      MyClass3: [ MyClass3, MyClass3$, null ],
+      MyClass4: [ MyClass4, MyClass4$, MyClass3 ]
     });
 
-  MemberTests$MyClass2._x = 'Hello';
-  MemberTests$MyClass3.c = new MemberTests$MyClass();
+  MyClass2._x = 'Hello';
+  MyClass3.c = new MyClass();
 
   return $exports;
 });
diff --git a/tests/TestCases/Member/Events/Baseline.txt b/tests/TestCases/Member/Events/Baseline.txt
index 8c73d020a..90f8c7329 100644
--- a/tests/TestCases/Member/Events/Baseline.txt
+++ b/tests/TestCases/Member/Events/Baseline.txt
@@ -5,24 +5,24 @@ define('test', ['ss'], function(ss) {
 
   // MemberTests.EventArgs
 
-  function MemberTests$EventArgs() {
+  function EventArgs() {
   }
-  var MemberTests$EventArgs$ = {
+  var EventArgs$ = {
 
   };
 
 
   // MemberTests.Button
 
-  function MemberTests$Button() {
+  function Button() {
   }
-  MemberTests$Button.add_test = function(value) {
-    MemberTests$Button.__test = ss.bindAdd(MemberTests$Button.__test, value);
-  }
-  MemberTests$Button.remove_test = function(value) {
-    MemberTests$Button.__test = ss.bindSub(MemberTests$Button.__test, value);
-  }
-  var MemberTests$Button$ = {
+  Button.add_test = function(value) {
+    Button.__test = ss.bindAdd(Button.__test, value);
+  };
+  Button.remove_test = function(value) {
+    Button.__test = ss.bindSub(Button.__test, value);
+  };
+  var Button$ = {
     add_click: function(value) {
       this.__click = ss.bindAdd(this.__click, value);
     },
@@ -42,7 +42,7 @@ define('test', ['ss'], function(ss) {
     },
     performClick: function() {
       if (this.__click != null) {
-        this.__click(this, new MemberTests$EventArgs());
+        this.__click(this, new EventArgs());
       }
     }
   };
@@ -50,8 +50,8 @@ define('test', ['ss'], function(ss) {
 
   var $exports = ss.module('test', null,
     {
-      EventArgs: [ MemberTests$EventArgs, MemberTests$EventArgs$, null ],
-      Button: [ MemberTests$Button, MemberTests$Button$, null ]
+      EventArgs: [ EventArgs, EventArgs$, null ],
+      Button: [ Button, Button$, null ]
     });
 
 
diff --git a/tests/TestCases/Member/Fields/Baseline.txt b/tests/TestCases/Member/Fields/Baseline.txt
index e792b7f4f..9dc6fefcf 100644
--- a/tests/TestCases/Member/Fields/Baseline.txt
+++ b/tests/TestCases/Member/Fields/Baseline.txt
@@ -5,7 +5,7 @@ define('test', ['ss'], function(ss) {
 
   // MemberTests.Mode
 
-  var MemberTests$Mode = {
+  var Mode = {
     a: 0, 
     b: 1
   };
@@ -13,7 +13,7 @@ define('test', ['ss'], function(ss) {
 
   // MemberTests.Point
 
-  function MemberTests$Point(x, y) {
+  function Point(x, y) {
     var $o = {};
     $o.x = x;
     $o.y = y;
@@ -23,7 +23,7 @@ define('test', ['ss'], function(ss) {
 
   // MemberTests.Test
 
-  function MemberTests$Test() {
+  function Test() {
     this._value = 0;
     this._uintValue = 0;
     this._dblValue = 0;
@@ -34,24 +34,24 @@ define('test', ['ss'], function(ss) {
     this.s = 'bbb';
     this.s = 'aaa';
   }
-  var MemberTests$Test$ = {
+  var Test$ = {
 
   };
 
 
   // MemberTests.App
 
-  function MemberTests$App() {
-    this._t = new MemberTests$Test();
+  function App() {
+    this._t = new Test();
     this._i = 5;
   }
-  var MemberTests$App$ = {
+  var App$ = {
     doTest: function() {
-      var t = new MemberTests$Test();
+      var t = new Test();
       t.s = 'World';
       var i = 1;
-      MemberTests$Test.done = true;
-      var p = MemberTests$Point(1, 10);
+      Test.done = true;
+      var p = Point(1, 10);
       p.x = p.y;
     }
   };
@@ -59,20 +59,20 @@ define('test', ['ss'], function(ss) {
 
   var $exports = ss.module('test',
     {
-      Point: MemberTests$Point
+      Point: Point
     },
     {
-      Mode: MemberTests$Mode,
-      Test: [ MemberTests$Test, MemberTests$Test$, null ],
-      App: [ MemberTests$App, MemberTests$App$, null ]
+      Mode: Mode,
+      Test: [ Test, Test$, null ],
+      App: [ App, App$, null ]
     });
 
-  MemberTests$Test.greeting = 'Hello!';
-  MemberTests$Test.myNumber = 1;
-  MemberTests$Test.defaultValue = 'aaa';
-  MemberTests$Test.done = false;
-  MemberTests$Test.XYZ = 1;
-  MemberTests$Test._key = {};
+  Test.greeting = 'Hello!';
+  Test.myNumber = 1;
+  Test.defaultValue = 'aaa';
+  Test.done = false;
+  Test.XYZ = 1;
+  Test._key = {};
 
   return $exports;
 });
diff --git a/tests/TestCases/Member/Indexers/Baseline.txt b/tests/TestCases/Member/Indexers/Baseline.txt
index 97e744d4f..3c2065171 100644
--- a/tests/TestCases/Member/Indexers/Baseline.txt
+++ b/tests/TestCases/Member/Indexers/Baseline.txt
@@ -5,17 +5,17 @@ define('test', ['ss'], function(ss) {
 
   // MemberTests.IIndexable
 
-  function MemberTests$IIndexable() { }
+  function IIndexable() { }
 
 
   // MemberTests.Normal
 
-  function MemberTests$Normal() {
+  function Normal() {
     this._n = 0;
     var i = this.get_item('name');
     this.set_item('name', i + 1);
   }
-  var MemberTests$Normal$ = {
+  var Normal$ = {
     get_item: function(name) {
       return this._n;
     },
@@ -28,11 +28,11 @@ define('test', ['ss'], function(ss) {
 
   // MemberTests.GetterOnly
 
-  function MemberTests$GetterOnly() {
+  function GetterOnly() {
     this._n = 0;
     var i = this.get_item('name');
   }
-  var MemberTests$GetterOnly$ = {
+  var GetterOnly$ = {
     get_item: function(name) {
       return this._n;
     }
@@ -41,12 +41,12 @@ define('test', ['ss'], function(ss) {
 
   // MemberTests.VirtualIndexer
 
-  function MemberTests$VirtualIndexer() {
+  function VirtualIndexer() {
     this._n = 0;
     var i = this.get_item('name');
     this.set_item('name', i + 1);
   }
-  var MemberTests$VirtualIndexer$ = {
+  var VirtualIndexer$ = {
     get_item: function(name) {
       return this._n;
     },
@@ -59,24 +59,24 @@ define('test', ['ss'], function(ss) {
 
   // MemberTests.AbstractIndexer
 
-  function MemberTests$AbstractIndexer() {
+  function AbstractIndexer() {
     this._n = 0;
     var i = this.get_item('name');
     this.set_item('name', i + 1);
   }
-  var MemberTests$AbstractIndexer$ = {
+  var AbstractIndexer$ = {
 
   };
 
 
   // MemberTests.MultipleArgs
 
-  function MemberTests$MultipleArgs() {
+  function MultipleArgs() {
     this._n = 0;
     var i = this.get_item('name', 'name2', 'name3');
     this.set_item('name', 'name2', 'name3', i + 1);
   }
-  var MemberTests$MultipleArgs$ = {
+  var MultipleArgs$ = {
     get_item: function(first, middle, last) {
       var value = first + middle + last;
       return value.length;
@@ -90,9 +90,9 @@ define('test', ['ss'], function(ss) {
 
   // MemberTests.ImplementedIndexer2
 
-  function MemberTests$ImplementedIndexer2() {
+  function ImplementedIndexer2() {
   }
-  var MemberTests$ImplementedIndexer2$ = {
+  var ImplementedIndexer2$ = {
     get_item: function(index) {
       return 0;
     }
@@ -101,26 +101,26 @@ define('test', ['ss'], function(ss) {
 
   // MemberTests.Test
 
-  function MemberTests$Test() {
-    var ma = new MemberTests$MultipleArgs();
+  function Test() {
+    var ma = new MultipleArgs();
     ma.set_item('1', '2', '3', ma.get_item('3', '2', '1'));
-    var ii = new MemberTests$ImplementedIndexer();
+    var ii = new ImplementedIndexer();
     ii.set_item('big', ii.get_item('small'));
     var ai = ii;
     ai.set_item('small', ai.get_item('big'));
-    var indexable = new MemberTests$ImplementedIndexer2();
+    var indexable = new ImplementedIndexer2();
     var o = indexable.get_item(0);
   }
-  var MemberTests$Test$ = {
+  var Test$ = {
 
   };
 
 
   // MemberTests.A
 
-  function MemberTests$A() {
+  function A() {
   }
-  var MemberTests$A$ = {
+  var A$ = {
     get_item: function(name) {
       return name;
     }
@@ -129,19 +129,19 @@ define('test', ['ss'], function(ss) {
 
   // MemberTests.OverriddenIndexer
 
-  function MemberTests$OverriddenIndexer() {
-    MemberTests$VirtualIndexer.call(this);
+  function OverriddenIndexer() {
+    VirtualIndexer.call(this);
     var i = this.get_item('name');
     this.set_item('name', i + 1);
-    var j = ss.base(this, 'get_item').call(this, 'name');
-    ss.base(this, 'set_item').call(this, 'name', 43);
+    var j = VirtualIndexer.prototype.get_item.call(this, 'name');
+    VirtualIndexer.prototype.set_item.call(this, 'name', 43);
   }
-  var MemberTests$OverriddenIndexer$ = {
+  var OverriddenIndexer$ = {
     get_item: function(name) {
-      return ss.base(this, 'get_item').call(this, name) + 1;
+      return VirtualIndexer.prototype.get_item.call(this, name) + 1;
     },
     set_item: function(name, value) {
-      ss.base(this, 'set_item').call(this, name, value - 1);
+      VirtualIndexer.prototype.set_item.call(this, name, value - 1);
       return value;
     }
   };
@@ -149,39 +149,39 @@ define('test', ['ss'], function(ss) {
 
   // MemberTests.ImplementedIndexer
 
-  function MemberTests$ImplementedIndexer() {
+  function ImplementedIndexer() {
     this._n$1 = 0;
-    MemberTests$AbstractIndexer.call(this);
+    AbstractIndexer.call(this);
     var i = this.get_item('name');
     this.set_item('name', i + 1);
   }
-  var MemberTests$ImplementedIndexer$ = {
+  var ImplementedIndexer$ = {
 
   };
 
 
   // MemberTests.B
 
-  function MemberTests$B() {
-    MemberTests$A.call(this);
+  function B() {
+    A.call(this);
   }
-  var MemberTests$B$ = {
+  var B$ = {
 
   };
 
 
   // MemberTests.C
 
-  function MemberTests$C() {
-    MemberTests$B.call(this);
+  function C() {
+    B.call(this);
   }
-  MemberTests$C.main = function() {
-    var c = new MemberTests$C();
+  C.main = function() {
+    var c = new C();
     c.set_item('a', c.get_item('b'));
     var a = c;
     a.set_item('b', a.get_item('c'));
-  }
-  var MemberTests$C$ = {
+  };
+  var C$ = {
     get_item: function(name) {
       return name;
     }
@@ -190,19 +190,19 @@ define('test', ['ss'], function(ss) {
 
   var $exports = ss.module('test', null,
     {
-      IIndexable: [ MemberTests$IIndexable ],
-      Normal: [ MemberTests$Normal, MemberTests$Normal$, null ],
-      GetterOnly: [ MemberTests$GetterOnly, MemberTests$GetterOnly$, null ],
-      VirtualIndexer: [ MemberTests$VirtualIndexer, MemberTests$VirtualIndexer$, null ],
-      AbstractIndexer: [ MemberTests$AbstractIndexer, MemberTests$AbstractIndexer$, null ],
-      MultipleArgs: [ MemberTests$MultipleArgs, MemberTests$MultipleArgs$, null ],
-      ImplementedIndexer2: [ MemberTests$ImplementedIndexer2, MemberTests$ImplementedIndexer2$, null, MemberTests$IIndexable ],
-      Test: [ MemberTests$Test, MemberTests$Test$, null ],
-      A: [ MemberTests$A, MemberTests$A$, null ],
-      OverriddenIndexer: [ MemberTests$OverriddenIndexer, MemberTests$OverriddenIndexer$, MemberTests$VirtualIndexer ],
-      ImplementedIndexer: [ MemberTests$ImplementedIndexer, MemberTests$ImplementedIndexer$, MemberTests$AbstractIndexer ],
-      B: [ MemberTests$B, MemberTests$B$, MemberTests$A ],
-      C: [ MemberTests$C, MemberTests$C$, MemberTests$B ]
+      IIndexable: [ IIndexable ],
+      Normal: [ Normal, Normal$, null ],
+      GetterOnly: [ GetterOnly, GetterOnly$, null ],
+      VirtualIndexer: [ VirtualIndexer, VirtualIndexer$, null ],
+      AbstractIndexer: [ AbstractIndexer, AbstractIndexer$, null ],
+      MultipleArgs: [ MultipleArgs, MultipleArgs$, null ],
+      ImplementedIndexer2: [ ImplementedIndexer2, ImplementedIndexer2$, null, IIndexable ],
+      Test: [ Test, Test$, null ],
+      A: [ A, A$, null ],
+      OverriddenIndexer: [ OverriddenIndexer, OverriddenIndexer$, VirtualIndexer ],
+      ImplementedIndexer: [ ImplementedIndexer, ImplementedIndexer$, AbstractIndexer ],
+      B: [ B, B$, A ],
+      C: [ C, C$, B ]
     });
 
 
diff --git a/tests/TestCases/Member/Methods/Baseline.txt b/tests/TestCases/Member/Methods/Baseline.txt
index 43eb908d7..667984ff6 100644
--- a/tests/TestCases/Member/Methods/Baseline.txt
+++ b/tests/TestCases/Member/Methods/Baseline.txt
@@ -5,9 +5,9 @@ define('test', ['ss'], function(ss) {
 
   // MemberTests.Test
 
-  function MemberTests$Test() {
+  function Test() {
   }
-  var MemberTests$Test$ = {
+  var Test$ = {
     do1: function() {
     },
     do2: function() {
@@ -25,7 +25,7 @@ define('test', ['ss'], function(ss) {
     },
     toString: function() {
       window.m1();
-      var x = new MemberTests$X();
+      var x = new X();
       $.fn.extend(x, 10);
       return null;
     }
@@ -35,22 +35,22 @@ define('test', ['ss'], function(ss) {
   // MemberTests.Foo
 
   $global.doStuff = function() {
-  }
+  };
 
 
   // MemberTests.Bar
 
   window.m1 = function() {
-  }
+  };
   window.m2 = function() {
-  }
+  };
 
 
   // MemberTests.X
 
-  function MemberTests$X() {
+  function X() {
   }
-  var MemberTests$X$ = {
+  var X$ = {
     update: function(i) {
     }
   };
@@ -61,13 +61,13 @@ define('test', ['ss'], function(ss) {
   $.fn.extend = function(x, i) {
     x.update(i);
     return x;
-  }
+  };
 
 
   var $exports = ss.module('test', null,
     {
-      Test: [ MemberTests$Test, MemberTests$Test$, null ],
-      X: [ MemberTests$X, MemberTests$X$, null ]
+      Test: [ Test, Test$, null ],
+      X: [ X, X$, null ]
     });
 
 
diff --git a/tests/TestCases/Member/Overloads/Baseline.txt b/tests/TestCases/Member/Overloads/Baseline.txt
index e57d214cb..801c322a0 100644
--- a/tests/TestCases/Member/Overloads/Baseline.txt
+++ b/tests/TestCases/Member/Overloads/Baseline.txt
@@ -5,11 +5,11 @@ define('test', ['ss'], function(ss) {
 
   // MemberTests.Test
 
-  function MemberTests$Test(name) {
+  function Test(name) {
   }
-  MemberTests$Test.doSomething = function(o) {
-  }
-  var MemberTests$Test$ = {
+  Test.doSomething = function(o) {
+  };
+  var Test$ = {
     invoke: function(successCallback, errorCallback, context) {
     }
   };
@@ -17,26 +17,26 @@ define('test', ['ss'], function(ss) {
 
   // MemberTests.App
 
-  function MemberTests$App() {
-    MemberTests$Test.doSomething();
-    MemberTests$Test.doSomething(null);
-    var t1 = new MemberTests$Test();
-    var t2 = new MemberTests$Test('test');
+  function App() {
+    Test.doSomething();
+    Test.doSomething(null);
+    var t1 = new Test();
+    var t2 = new Test('test');
     var cb1 = null;
     var cb2 = null;
     t1.invoke(cb1);
     t1.invoke(cb1, cb2);
     t2.invoke(cb1, cb2, t1);
   }
-  var MemberTests$App$ = {
+  var App$ = {
 
   };
 
 
   var $exports = ss.module('test', null,
     {
-      Test: [ MemberTests$Test, MemberTests$Test$, null ],
-      App: [ MemberTests$App, MemberTests$App$, null ]
+      Test: [ Test, Test$, null ],
+      App: [ App, App$, null ]
     });
 
 
diff --git a/tests/TestCases/Member/Properties/Baseline.txt b/tests/TestCases/Member/Properties/Baseline.txt
index 14f2c28b3..88c797959 100644
--- a/tests/TestCases/Member/Properties/Baseline.txt
+++ b/tests/TestCases/Member/Properties/Baseline.txt
@@ -5,20 +5,20 @@ define('test', ['ss'], function(ss) {
 
   // MemberTests.Test
 
-  function MemberTests$Test() {
+  function Test() {
     this.set_XYZ(1);
     this.set_XYZ(this.get_name().length);
     this.set_XYZ(this.get_name().length);
-    var v = MemberTests$Test.get_staticProp();
-    v = MemberTests$Test.get_staticProp();
+    var v = Test.get_staticProp();
+    v = Test.get_staticProp();
   }
-  MemberTests$Test.get_staticProp = function() {
+  Test.get_staticProp = function() {
     return 2006;
-  }
-  MemberTests$Test.set_staticProp = function(value) {
+  };
+  Test.set_staticProp = function(value) {
     return value;
-  }
-  var MemberTests$Test$ = {
+  };
+  var Test$ = {
     get_XYZ: function() {
       return 0;
     },
@@ -39,24 +39,24 @@ define('test', ['ss'], function(ss) {
 
   // MemberTests.Test2
 
-  function MemberTests$Test2() {
-    MemberTests$Test.call(this);
-    var n = MemberTests$Test$.get_XYZ.call(this);
+  function Test2() {
+    Test.call(this);
+    var n = Test.prototype.get_XYZ.call(this);
     if (n === this.get_XYZ()) {
     }
     if (this.get_XYZ() === n) {
     }
-    n = MemberTests$Test.get_staticProp();
+    n = Test.get_staticProp();
   }
-  var MemberTests$Test2$ = {
+  var Test2$ = {
 
   };
 
 
   var $exports = ss.module('test', null,
     {
-      Test: [ MemberTests$Test, MemberTests$Test$, null ],
-      Test2: [ MemberTests$Test2, MemberTests$Test2$, MemberTests$Test ]
+      Test: [ Test, Test$, null ],
+      Test2: [ Test2, Test2$, Test ]
     });
 
 
diff --git a/tests/TestCases/Member/StaticConstructors/Baseline.txt b/tests/TestCases/Member/StaticConstructors/Baseline.txt
index 3d48811ee..913abdd21 100644
--- a/tests/TestCases/Member/StaticConstructors/Baseline.txt
+++ b/tests/TestCases/Member/StaticConstructors/Baseline.txt
@@ -5,70 +5,70 @@ define('test', ['ss'], function(ss) {
 
   // MemberTests.Behavior
 
-  function MemberTests$Behavior(e, name) {
+  function Behavior(e, name) {
   }
-  var MemberTests$Behavior$ = {
+  var Behavior$ = {
 
   };
 
 
   // MemberTests.MyClass
 
-  function MemberTests$MyClass(d) {
+  function MyClass(d) {
   }
-  var MemberTests$MyClass$ = {
+  var MyClass$ = {
 
   };
 
 
   // MemberTests.MyClassEmpty
 
-  function MemberTests$MyClassEmpty() {
+  function MyClassEmpty() {
   }
-  var MemberTests$MyClassEmpty$ = {
+  var MyClassEmpty$ = {
 
   };
 
 
   // MemberTests.MyClassSimple
 
-  function MemberTests$MyClassSimple() {
+  function MyClassSimple() {
   }
-  var MemberTests$MyClassSimple$ = {
+  var MyClassSimple$ = {
 
   };
 
 
   // MemberTests.MyClassSimpleMulti
 
-  function MemberTests$MyClassSimpleMulti() {
+  function MyClassSimpleMulti() {
   }
-  var MemberTests$MyClassSimpleMulti$ = {
+  var MyClassSimpleMulti$ = {
 
   };
 
 
   // MemberTests.MyBehavior
 
-  function MemberTests$MyBehavior(element) {
-    MemberTests$Behavior.call(this, element, 'myBehavior');
+  function MyBehavior(element) {
+    Behavior.call(this, element, 'myBehavior');
   }
-  var MemberTests$MyBehavior$ = {
+  var MyBehavior$ = {
 
   };
 
 
   var $exports = ss.module('test', null,
     {
-      Behavior: [ MemberTests$Behavior, MemberTests$Behavior$, null ],
-      MyClass: [ MemberTests$MyClass, MemberTests$MyClass$, null ],
-      MyClassEmpty: [ MemberTests$MyClassEmpty, MemberTests$MyClassEmpty$, null ],
-      MyClassSimple: [ MemberTests$MyClassSimple, MemberTests$MyClassSimple$, null ],
-      MyClassSimpleMulti: [ MemberTests$MyClassSimpleMulti, MemberTests$MyClassSimpleMulti$, null ],
-      MyBehavior: [ MemberTests$MyBehavior, MemberTests$MyBehavior$, MemberTests$Behavior ]
+      Behavior: [ Behavior, Behavior$, null ],
+      MyClass: [ MyClass, MyClass$, null ],
+      MyClassEmpty: [ MyClassEmpty, MyClassEmpty$, null ],
+      MyClassSimple: [ MyClassSimple, MyClassSimple$, null ],
+      MyClassSimpleMulti: [ MyClassSimpleMulti, MyClassSimpleMulti$, null ],
+      MyBehavior: [ MyBehavior, MyBehavior$, Behavior ]
     });
 
-  MemberTests$MyClass.instance = new MemberTests$MyClass(ss.now());
+  MyClass.instance = new MyClass(ss.now());
   alert('simple static ctor');
   alert('simple static ctor with multiple statements');
   document.getElementById('foo').innerHTML = '...';
@@ -78,7 +78,7 @@ define('test', ['ss'], function(ss) {
     if (!b) {
       return;
     }
-    new MemberTests$MyBehavior(e);
+    new MyBehavior(e);
   })();
 
   return $exports;
diff --git a/tests/TestCases/Statement/Exceptions/Baseline.txt b/tests/TestCases/Statement/Exceptions/Baseline.txt
index 10685d97d..5759e75c4 100644
--- a/tests/TestCases/Statement/Exceptions/Baseline.txt
+++ b/tests/TestCases/Statement/Exceptions/Baseline.txt
@@ -5,9 +5,9 @@ define('test', ['ss'], function(ss) {
 
   // StatementTests.App
 
-  function StatementTests$App() {
+  function App() {
   }
-  var StatementTests$App$ = {
+  var App$ = {
     test: function(arg) {
       if (arg == null) {
         throw new Error('null');
@@ -42,7 +42,7 @@ define('test', ['ss'], function(ss) {
 
   var $exports = ss.module('test', null,
     {
-      App: [ StatementTests$App, StatementTests$App$, null ]
+      App: [ App, App$, null ]
     });
 
 
diff --git a/tests/TestCases/Statement/Expression/Baseline.txt b/tests/TestCases/Statement/Expression/Baseline.txt
index 35a6e7f03..88a508977 100644
--- a/tests/TestCases/Statement/Expression/Baseline.txt
+++ b/tests/TestCases/Statement/Expression/Baseline.txt
@@ -5,9 +5,9 @@ define('test', ['ss'], function(ss) {
 
   // StatementTests.App
 
-  function StatementTests$App() {
+  function App() {
   }
-  var StatementTests$App$ = {
+  var App$ = {
     test: function(arg) {
       var x;
       arg = x.length;
@@ -19,7 +19,7 @@ define('test', ['ss'], function(ss) {
 
   var $exports = ss.module('test', null,
     {
-      App: [ StatementTests$App, StatementTests$App$, null ]
+      App: [ App, App$, null ]
     });
 
 
diff --git a/tests/TestCases/Statement/For/Baseline.txt b/tests/TestCases/Statement/For/Baseline.txt
index d5bc3a858..d482246b1 100644
--- a/tests/TestCases/Statement/For/Baseline.txt
+++ b/tests/TestCases/Statement/For/Baseline.txt
@@ -5,9 +5,9 @@ define('test', ['ss'], function(ss) {
 
   // StatementTests.App
 
-  function StatementTests$App() {
+  function App() {
   }
-  var StatementTests$App$ = {
+  var App$ = {
     test: function(arg) {
       for (var i = 0; i < 10; i++) {
       }
@@ -32,7 +32,7 @@ define('test', ['ss'], function(ss) {
 
   var $exports = ss.module('test', null,
     {
-      App: [ StatementTests$App, StatementTests$App$, null ]
+      App: [ App, App$, null ]
     });
 
 
diff --git a/tests/TestCases/Statement/Foreach/Baseline.txt b/tests/TestCases/Statement/Foreach/Baseline.txt
index 9dd89ea51..05132b714 100644
--- a/tests/TestCases/Statement/Foreach/Baseline.txt
+++ b/tests/TestCases/Statement/Foreach/Baseline.txt
@@ -5,9 +5,9 @@ define('test', ['ss'], function(ss) {
 
   // StatementTests.Set
 
-  function StatementTests$Set() {
+  function Set() {
   }
-  var StatementTests$Set$ = {
+  var Set$ = {
     getEnumerator: function() {
       return ss.enumerate(this._items);
     }
@@ -16,9 +16,9 @@ define('test', ['ss'], function(ss) {
 
   // StatementTests.App
 
-  function StatementTests$App() {
+  function App() {
   }
-  var StatementTests$App$ = {
+  var App$ = {
     test: function(arg) {
       var items = [ 1, 2, 3 ];
       var sum = 0;
@@ -32,7 +32,7 @@ define('test', ['ss'], function(ss) {
         var entry = { key: $key2, value: d[$key2] };
         var s = entry.key + ' = ' + entry.value;
       }
-      var s = new StatementTests$Set();
+      var s = new Set();
       var $enum3 = ss.enumerate(s);
       while ($enum3.moveNext()) {
         var o = $enum3.current;
@@ -57,8 +57,8 @@ define('test', ['ss'], function(ss) {
 
   var $exports = ss.module('test', null,
     {
-      Set: [ StatementTests$Set, StatementTests$Set$, null, ss.IEnumerable ],
-      App: [ StatementTests$App, StatementTests$App$, null ]
+      Set: [ Set, Set$, null, ss.IEnumerable ],
+      App: [ App, App$, null ]
     });
 
 
diff --git a/tests/TestCases/Statement/IfElse/Baseline.txt b/tests/TestCases/Statement/IfElse/Baseline.txt
index 3a15f6be1..c700a814d 100644
--- a/tests/TestCases/Statement/IfElse/Baseline.txt
+++ b/tests/TestCases/Statement/IfElse/Baseline.txt
@@ -5,9 +5,9 @@ define('test', ['ss'], function(ss) {
 
   // StatementTests.App
 
-  function StatementTests$App() {
+  function App() {
   }
-  var StatementTests$App$ = {
+  var App$ = {
     testMethod: function(boolValue, numValue) {
       if (boolValue) {
       }
@@ -34,7 +34,7 @@ define('test', ['ss'], function(ss) {
 
   var $exports = ss.module('test', null,
     {
-      App: [ StatementTests$App, StatementTests$App$, null ]
+      App: [ App, App$, null ]
     });
 
 
diff --git a/tests/TestCases/Statement/Return/Baseline.txt b/tests/TestCases/Statement/Return/Baseline.txt
index 6d84dc2fa..65deb254d 100644
--- a/tests/TestCases/Statement/Return/Baseline.txt
+++ b/tests/TestCases/Statement/Return/Baseline.txt
@@ -5,9 +5,9 @@ define('test', ['ss'], function(ss) {
 
   // StatementTests.App
 
-  function StatementTests$App() {
+  function App() {
   }
-  var StatementTests$App$ = {
+  var App$ = {
     test1: function(arg) {
       return 0;
     },
@@ -32,7 +32,7 @@ define('test', ['ss'], function(ss) {
 
   var $exports = ss.module('test', null,
     {
-      App: [ StatementTests$App, StatementTests$App$, null ]
+      App: [ App, App$, null ]
     });
 
 
diff --git a/tests/TestCases/Statement/Switch/Baseline.txt b/tests/TestCases/Statement/Switch/Baseline.txt
index 7f14c07fb..f5808b93a 100644
--- a/tests/TestCases/Statement/Switch/Baseline.txt
+++ b/tests/TestCases/Statement/Switch/Baseline.txt
@@ -5,7 +5,7 @@ define('test', ['ss'], function(ss) {
 
   // StatementTests.Mode
 
-  var StatementTests$Mode = {
+  var Mode = {
     foo: 0, 
     bar: 1
   };
@@ -13,9 +13,9 @@ define('test', ['ss'], function(ss) {
 
   // StatementTests.App
 
-  function StatementTests$App() {
+  function App() {
   }
-  var StatementTests$App$ = {
+  var App$ = {
     test: function(arg, m) {
       var i;
       switch (i) {
@@ -56,8 +56,8 @@ define('test', ['ss'], function(ss) {
 
   var $exports = ss.module('test', null,
     {
-      Mode: StatementTests$Mode,
-      App: [ StatementTests$App, StatementTests$App$, null ]
+      Mode: Mode,
+      App: [ App, App$, null ]
     });
 
 
diff --git a/tests/TestCases/Statement/Variables/Baseline.txt b/tests/TestCases/Statement/Variables/Baseline.txt
index 69b6ec1c9..b43fc3187 100644
--- a/tests/TestCases/Statement/Variables/Baseline.txt
+++ b/tests/TestCases/Statement/Variables/Baseline.txt
@@ -5,9 +5,9 @@ define('test', ['ss'], function(ss) {
 
   // StatementTests.App
 
-  function StatementTests$App() {
+  function App() {
   }
-  var StatementTests$App$ = {
+  var App$ = {
     test: function() {
       var i = 0;
       var b = true;
@@ -35,7 +35,7 @@ define('test', ['ss'], function(ss) {
 
   var $exports = ss.module('test', null,
     {
-      App: [ StatementTests$App, StatementTests$App$, null ]
+      App: [ App, App$, null ]
     });
 
 
diff --git a/tests/TestCases/Statement/While/Baseline.txt b/tests/TestCases/Statement/While/Baseline.txt
index 61a8aa9e6..4abb1ea5c 100644
--- a/tests/TestCases/Statement/While/Baseline.txt
+++ b/tests/TestCases/Statement/While/Baseline.txt
@@ -5,9 +5,9 @@ define('test', ['ss'], function(ss) {
 
   // StatementTests.App
 
-  function StatementTests$App() {
+  function App() {
   }
-  var StatementTests$App$ = {
+  var App$ = {
     test: function(arg) {
       var i;
       while (i < arg) {
@@ -29,7 +29,7 @@ define('test', ['ss'], function(ss) {
 
   var $exports = ss.module('test', null,
     {
-      App: [ StatementTests$App, StatementTests$App$, null ]
+      App: [ App, App$, null ]
     });
 
 
diff --git a/tests/TestCases/Type/Classes/Baseline.txt b/tests/TestCases/Type/Classes/Baseline.txt
index fd0d4b5c0..5117bc4c6 100644
--- a/tests/TestCases/Type/Classes/Baseline.txt
+++ b/tests/TestCases/Type/Classes/Baseline.txt
@@ -5,59 +5,66 @@ define('test', ['ss'], function(ss) {
 
   // TypeTests.Foo
 
-  function TypeTests$FooBarBaz() {
+  function FooBarBaz() {
   }
-  var TypeTests$FooBarBaz$ = {
+  var FooBarBaz$ = {
 
   };
 
 
   // TypeTests.MyClass
 
-  function TypeTests$MyClass() {
-    var f = new TypeTests$FooBarBaz();
+  function MyClass() {
+    var f = new FooBarBaz();
   }
-  var TypeTests$MyClass$ = {
+  var MyClass$ = {
 
   };
 
 
   // TypeTests.MyClass3
 
-  function TypeTests$MyClass3() {
+  function MyClass3() {
   }
-  var TypeTests$MyClass3$ = {
+  var MyClass3$ = {
 
   };
 
 
+  // TypeTests.StaticClass
+
+  function StaticClass() {
+  }
+
+
   // TypeTests.MyClass2
 
-  function TypeTests$MyClass2() {
-    TypeTests$MyClass.call(this);
+  function MyClass2() {
+    MyClass.call(this);
   }
-  var TypeTests$MyClass2$ = {
+  var MyClass2$ = {
 
   };
 
 
   // TypeTests.MyClass4
 
-  function TypeTests$MyClass4() {
-    TypeTests$MyClass.call(this);
+  function MyClass4() {
+    MyClass.call(this);
   }
-  var TypeTests$MyClass4$ = {
+  var MyClass4$ = {
 
   };
 
 
   var $exports = ss.module('test', null,
     {
-      FooBarBaz: [ TypeTests$FooBarBaz, TypeTests$FooBarBaz$, null ],
-      MyClass: [ TypeTests$MyClass, TypeTests$MyClass$, null ],
-      MyClass3: [ TypeTests$MyClass3, TypeTests$MyClass3$, null, ss.IDisposable ],
-      MyClass2: [ TypeTests$MyClass2, TypeTests$MyClass2$, TypeTests$MyClass ],
-      MyClass4: [ TypeTests$MyClass4, TypeTests$MyClass4$, TypeTests$MyClass, ss.IDisposable ]
+      FooBarBaz: [ FooBarBaz, FooBarBaz$, null ],
+      MyClass: [ MyClass, MyClass$, null ],
+      MyClass3: [ MyClass3, MyClass3$, null, ss.IDisposable ],
+      StaticClass: [ StaticClass, null, null ],
+      MyClass2: [ MyClass2, MyClass2$, MyClass ],
+      MyClass4: [ MyClass4, MyClass4$, MyClass, ss.IDisposable ]
     });
 
 
diff --git a/tests/TestCases/Type/Classes/Code.cs b/tests/TestCases/Type/Classes/Code.cs
index 8fb84036d..dc53ab7aa 100644
--- a/tests/TestCases/Type/Classes/Code.cs
+++ b/tests/TestCases/Type/Classes/Code.cs
@@ -21,4 +21,7 @@ public class MyClass3 : IDisposable {
 
     public class MyClass4 : MyClass, IDisposable {
     }
+
+    public static class StaticClass {
+    }
 }
diff --git a/tests/TestCases/Type/Delegates/Baseline.txt b/tests/TestCases/Type/Delegates/Baseline.txt
index 8dccc3979..126e195e7 100644
--- a/tests/TestCases/Type/Delegates/Baseline.txt
+++ b/tests/TestCases/Type/Delegates/Baseline.txt
@@ -5,16 +5,16 @@ define('test', ['ss'], function(ss) {
 
   // TypeTests.EventArgs
 
-  function TypeTests$EventArgs() {
+  function EventArgs() {
   }
-  var TypeTests$EventArgs$ = {
+  var EventArgs$ = {
 
   };
 
 
   var $exports = ss.module('test', null,
     {
-      EventArgs: [ TypeTests$EventArgs, TypeTests$EventArgs$, null ]
+      EventArgs: [ EventArgs, EventArgs$, null ]
     });
 
 
diff --git a/tests/TestCases/Type/Enumerator/Baseline.txt b/tests/TestCases/Type/Enumerator/Baseline.txt
index 24415225e..3e8a15e0f 100644
--- a/tests/TestCases/Type/Enumerator/Baseline.txt
+++ b/tests/TestCases/Type/Enumerator/Baseline.txt
@@ -5,9 +5,9 @@ define('test', ['ss'], function(ss) {
 
   // TypeTests.App1
 
-  function TypeTests$App1() {
+  function App1() {
   }
-  var TypeTests$App1$ = {
+  var App1$ = {
     getEnumerator: function() {
       return null;
     }
@@ -16,9 +16,9 @@ define('test', ['ss'], function(ss) {
 
   // TypeTests.App
 
-  function TypeTests$App() {
+  function App() {
   }
-  var TypeTests$App$ = {
+  var App$ = {
     test1: function(arg) {
     },
     test: function(arg) {
@@ -45,8 +45,8 @@ define('test', ['ss'], function(ss) {
 
   var $exports = ss.module('test', null,
     {
-      App1: [ TypeTests$App1, TypeTests$App1$, null, ss.IEnumerable ],
-      App: [ TypeTests$App, TypeTests$App$, null ]
+      App1: [ App1, App1$, null, ss.IEnumerable ],
+      App: [ App, App$, null ]
     });
 
 
diff --git a/tests/TestCases/Type/Enums/Baseline.txt b/tests/TestCases/Type/Enums/Baseline.txt
index 8087e07c0..8735225fd 100644
--- a/tests/TestCases/Type/Enums/Baseline.txt
+++ b/tests/TestCases/Type/Enums/Baseline.txt
@@ -5,7 +5,7 @@ define('test', ['ss'], function(ss) {
 
   // TypeTests.Colors
 
-  var TypeTests$Colors = {
+  var Colors = {
     red: 0, 
     green: 1, 
     blue: 2
@@ -14,7 +14,7 @@ define('test', ['ss'], function(ss) {
 
   // TypeTests.Sequence
 
-  var TypeTests$Sequence = {
+  var Sequence = {
     item1: 1, 
     item2: 2, 
     item3: 3, 
@@ -24,7 +24,7 @@ define('test', ['ss'], function(ss) {
 
   // TypeTests.Mode
 
-  var TypeTests$Mode = {
+  var Mode = {
     Public: 1, 
     Protected: 2, 
     Private: 4
@@ -33,7 +33,7 @@ define('test', ['ss'], function(ss) {
 
   // TypeTests.UInt32Mask
 
-  var TypeTests$UInt32Mask = {
+  var UInt32Mask = {
     v: 4026531840, 
     a: 4278190080
   };
@@ -41,7 +41,7 @@ define('test', ['ss'], function(ss) {
 
   // TypeTests.ShortMask
 
-  var TypeTests$ShortMask = {
+  var ShortMask = {
     v: 1, 
     a: 4096
   };
@@ -49,7 +49,7 @@ define('test', ['ss'], function(ss) {
 
   // TypeTests.Errors
 
-  var TypeTests$Errors = {
+  var Errors = {
     S_OK: 0, 
     S_FALSE: 1, 
     E_FAIL: -1
@@ -58,23 +58,23 @@ define('test', ['ss'], function(ss) {
 
   // TypeTests.App
 
-  function TypeTests$App() {
+  function App() {
   }
-  TypeTests$App.main = function() {
+  App.main = function() {
     var m = 1;
     m = 1 | 4;
     var c = 0;
-  }
-  var TypeTests$App$ = {
+  };
+  var App$ = {
 
   };
 
 
   // TypeTests.App2
 
-  function TypeTests$App2() {
+  function App2() {
   }
-  var TypeTests$App2$ = {
+  var App2$ = {
     run: function() {
       var method = 'POST';
       this.run1('GET');
@@ -95,14 +95,14 @@ define('test', ['ss'], function(ss) {
 
   var $exports = ss.module('test', null,
     {
-      Colors: TypeTests$Colors,
-      Sequence: TypeTests$Sequence,
-      Mode: TypeTests$Mode,
-      UInt32Mask: TypeTests$UInt32Mask,
-      ShortMask: TypeTests$ShortMask,
-      Errors: TypeTests$Errors,
-      App: [ TypeTests$App, TypeTests$App$, null ],
-      App2: [ TypeTests$App2, TypeTests$App2$, null ]
+      Colors: Colors,
+      Sequence: Sequence,
+      Mode: Mode,
+      UInt32Mask: UInt32Mask,
+      ShortMask: ShortMask,
+      Errors: Errors,
+      App: [ App, App$, null ],
+      App2: [ App2, App2$, null ]
     });
 
 
diff --git a/tests/TestCases/Type/Globals/Baseline.txt b/tests/TestCases/Type/Globals/Baseline.txt
index f572d9e99..3a47937f6 100644
--- a/tests/TestCases/Type/Globals/Baseline.txt
+++ b/tests/TestCases/Type/Globals/Baseline.txt
@@ -39,9 +39,9 @@ define('test', ['ss'], function(ss) {
 
   // Foo.MyClassF
 
-  function Foo$MyClassF() {
+  function MyClassF() {
   }
-  var Foo$MyClassF$ = {
+  var MyClassF$ = {
 
   };
 
@@ -77,7 +77,7 @@ define('test', ['ss'], function(ss) {
       MyRecord: MyRecord,
       MyClass: [ MyClass, MyClass$, null ],
       MyClass3: [ MyClass3, MyClass3$, null, ss.IDisposable ],
-      MyClassF: [ Foo$MyClassF, Foo$MyClassF$, null ],
+      MyClassF: [ MyClassF, MyClassF$, null ],
       MyClass2: [ MyClass2, MyClass2$, MyClass ],
       MyClass4: [ MyClass4, MyClass4$, MyClass, ss.IDisposable ]
     });
diff --git a/tests/TestCases/Type/Imported/Baseline.txt b/tests/TestCases/Type/Imported/Baseline.txt
index c8eaaf777..5ba93744b 100644
--- a/tests/TestCases/Type/Imported/Baseline.txt
+++ b/tests/TestCases/Type/Imported/Baseline.txt
@@ -5,7 +5,7 @@ define('test', ['ss'], function(ss) {
 
   // TypeTests.App
 
-  function TypeTests$App() {
+  function App() {
     var elem = document.getElementById('foo');
     var s = elem.myString;
     elem.do('foo');
@@ -14,20 +14,20 @@ define('test', ['ss'], function(ss) {
     var n = ss.truncate(5.5);
     var parser = new DOMParser();
     var doc = parser.parseFromString('<markup></markup>', 'text/xml');
-    var d = Date.parseDate('1/1/2010');
+    var d = ss.date('1/1/2010');
     var eventHandler = function() {
     };
     elem.addEventListener('click', eventHandler);
     elem.removeEventListener('click', eventHandler);
   }
-  var TypeTests$App$ = {
+  var App$ = {
 
   };
 
 
   var $exports = ss.module('test', null,
     {
-      App: [ TypeTests$App, TypeTests$App$, null ]
+      App: [ App, App$, null ]
     });
 
 
diff --git a/tests/TestCases/Type/Interfaces/Baseline.txt b/tests/TestCases/Type/Interfaces/Baseline.txt
index ecdc1e80d..6291d1c62 100644
--- a/tests/TestCases/Type/Interfaces/Baseline.txt
+++ b/tests/TestCases/Type/Interfaces/Baseline.txt
@@ -5,24 +5,24 @@ define('test', ['ss'], function(ss) {
 
   // TypeTests.IMarker
 
-  function TypeTests$IMarker() { }
+  function IMarker() { }
 
 
   // TypeTests.ISerializable
 
-  function TypeTests$ISerializable() { }
+  function ISerializable() { }
 
 
   // TypeTests.IRunnable
 
-  function TypeTests$IRunnable() { }
+  function IRunnable() { }
 
 
   // TypeTests.MyObject
 
-  function TypeTests$MyObject() {
+  function MyObject() {
   }
-  var TypeTests$MyObject$ = {
+  var MyObject$ = {
     dispose: function() {
     }
   };
@@ -30,9 +30,9 @@ define('test', ['ss'], function(ss) {
 
   // TypeTests.Foo
 
-  function TypeTests$Foo() {
+  function Foo() {
   }
-  var TypeTests$Foo$ = {
+  var Foo$ = {
     get_canRun: function() {
       return true;
     },
@@ -46,10 +46,10 @@ define('test', ['ss'], function(ss) {
 
   // TypeTests.MyObject2
 
-  function TypeTests$MyObject2() {
-    TypeTests$MyObject.call(this);
+  function MyObject2() {
+    MyObject.call(this);
   }
-  var TypeTests$MyObject2$ = {
+  var MyObject2$ = {
     get_canRun: function() {
       return true;
     },
@@ -60,12 +60,12 @@ define('test', ['ss'], function(ss) {
 
   var $exports = ss.module('test', null,
     {
-      IMarker: [ TypeTests$IMarker ],
-      ISerializable: [ TypeTests$ISerializable ],
-      IRunnable: [ TypeTests$IRunnable ],
-      MyObject: [ TypeTests$MyObject, TypeTests$MyObject$, null, ss.IDisposable ],
-      Foo: [ TypeTests$Foo, TypeTests$Foo$, null, TypeTests$IMarker, TypeTests$ISerializable, TypeTests$IRunnable ],
-      MyObject2: [ TypeTests$MyObject2, TypeTests$MyObject2$, TypeTests$MyObject, TypeTests$IRunnable ]
+      IMarker: [ IMarker ],
+      ISerializable: [ ISerializable ],
+      IRunnable: [ IRunnable ],
+      MyObject: [ MyObject, MyObject$, null, ss.IDisposable ],
+      Foo: [ Foo, Foo$, null, IMarker, ISerializable, IRunnable ],
+      MyObject2: [ MyObject2, MyObject2$, MyObject, IRunnable ]
     });
 
 
diff --git a/tests/TestCases/Type/Modules/Baseline.txt b/tests/TestCases/Type/Modules/Baseline.txt
index 8f652508d..8d957f368 100644
--- a/tests/TestCases/Type/Modules/Baseline.txt
+++ b/tests/TestCases/Type/Modules/Baseline.txt
@@ -5,16 +5,16 @@ define('test', ['ss'], function(ss) {
 
   // App.Dummy
 
-  function App$Dummy() {
+  function Dummy() {
   }
-  var App$Dummy$ = {
+  var Dummy$ = {
 
   };
 
 
   var $exports = ss.module('test', null,
     {
-      Dummy: [ App$Dummy, App$Dummy$, null ]
+      Dummy: [ Dummy, Dummy$, null ]
     });
 
   alert('Hello Startup');
diff --git a/tests/TestCases/Type/Namespaces/Baseline.txt b/tests/TestCases/Type/Namespaces/Baseline.txt
index 9e826017c..7461b53b9 100644
--- a/tests/TestCases/Type/Namespaces/Baseline.txt
+++ b/tests/TestCases/Type/Namespaces/Baseline.txt
@@ -5,20 +5,20 @@ define('test', ['ss'], function(ss) {
 
   // TypeTests.Sub1.Sub2.MyClass
 
-  function TypeTests$Sub1$Sub2$MyClass() {
-    var yc = new TypeTests$Sub1$YourClass();
+  function MyClass() {
+    var yc = new YourClass();
     yc.run();
   }
-  var TypeTests$Sub1$Sub2$MyClass$ = {
+  var MyClass$ = {
 
   };
 
 
   // TypeTests.Sub1.YourClass
 
-  function TypeTests$Sub1$YourClass() {
+  function YourClass() {
   }
-  var TypeTests$Sub1$YourClass$ = {
+  var YourClass$ = {
     run: function() {
     }
   };
@@ -26,37 +26,37 @@ define('test', ['ss'], function(ss) {
 
   // TypeTests.YourClass1
 
-  function TypeTests$YourClass1() {
+  function YourClass1() {
   }
-  var TypeTests$YourClass1$ = {
+  var YourClass1$ = {
 
   };
 
 
   // MyApp.Foo.MyClassF
 
-  function MyApp$Foo$MyClassF() {
+  function MyClassF() {
   }
-  var MyApp$Foo$MyClassF$ = {
+  var MyClassF$ = {
 
   };
 
 
   // MyApp.Test
 
-  function MyApp$Test() {
-    var c = new TypeTests$Sub1$Sub2$MyClass();
+  function Test() {
+    var c = new MyClass();
   }
-  var MyApp$Test$ = {
+  var Test$ = {
 
   };
 
 
   // MyCompany.Utility
 
-  function MyCompany$Utility() {
+  function Utility() {
   }
-  var MyCompany$Utility$ = {
+  var Utility$ = {
     run: function() {
     }
   };
@@ -64,34 +64,34 @@ define('test', ['ss'], function(ss) {
 
   // MyCompany.MyProduct.UtilityP
 
-  function MyCompany$MyProduct$UtilityP() {
+  function UtilityP() {
   }
-  var MyCompany$MyProduct$UtilityP$ = {
+  var UtilityP$ = {
 
   };
 
 
   // MyCompany.MyProduct.MyComponent.Component
 
-  function MyCompany$MyProduct$MyComponent$Component() {
-    var u = new MyCompany$Utility();
+  function Component() {
+    var u = new Utility();
     u.run();
   }
-  var MyCompany$MyProduct$MyComponent$Component$ = {
+  var Component$ = {
 
   };
 
 
   var $exports = ss.module('test', null,
     {
-      MyClass: [ TypeTests$Sub1$Sub2$MyClass, TypeTests$Sub1$Sub2$MyClass$, null ],
-      YourClass: [ TypeTests$Sub1$YourClass, TypeTests$Sub1$YourClass$, null ],
-      YourClass1: [ TypeTests$YourClass1, TypeTests$YourClass1$, null ],
-      MyClassF: [ MyApp$Foo$MyClassF, MyApp$Foo$MyClassF$, null ],
-      Test: [ MyApp$Test, MyApp$Test$, null ],
-      Utility: [ MyCompany$Utility, MyCompany$Utility$, null ],
-      UtilityP: [ MyCompany$MyProduct$UtilityP, MyCompany$MyProduct$UtilityP$, null ],
-      Component: [ MyCompany$MyProduct$MyComponent$Component, MyCompany$MyProduct$MyComponent$Component$, null ]
+      MyClass: [ MyClass, MyClass$, null ],
+      YourClass: [ YourClass, YourClass$, null ],
+      YourClass1: [ YourClass1, YourClass1$, null ],
+      MyClassF: [ MyClassF, MyClassF$, null ],
+      Test: [ Test, Test$, null ],
+      Utility: [ Utility, Utility$, null ],
+      UtilityP: [ UtilityP, UtilityP$, null ],
+      Component: [ Component, Component$, null ]
     });
 
 
diff --git a/tests/TestCases/Type/Nullable/Baseline.txt b/tests/TestCases/Type/Nullable/Baseline.txt
index b78d83aa2..139768a83 100644
--- a/tests/TestCases/Type/Nullable/Baseline.txt
+++ b/tests/TestCases/Type/Nullable/Baseline.txt
@@ -5,9 +5,9 @@ define('test', ['ss'], function(ss) {
 
   // TypeTests.App
 
-  function TypeTests$App() {
+  function App() {
   }
-  var TypeTests$App$ = {
+  var App$ = {
     method: function() {
       var i = 10;
       var b = true;
@@ -32,7 +32,7 @@ define('test', ['ss'], function(ss) {
 
   var $exports = ss.module('test', null,
     {
-      App: [ TypeTests$App, TypeTests$App$, null ]
+      App: [ App, App$, null ]
     });
 
 
diff --git a/tests/TestCases/Type/Partials/Baseline.txt b/tests/TestCases/Type/Partials/Baseline.txt
index f6c537bcb..11d256e6c 100644
--- a/tests/TestCases/Type/Partials/Baseline.txt
+++ b/tests/TestCases/Type/Partials/Baseline.txt
@@ -5,23 +5,23 @@ define('test', ['ss'], function(ss) {
 
   // TypeTests.IMyInterface
 
-  function TypeTests$IMyInterface() { }
+  function IMyInterface() { }
 
 
   // TypeTests.EmptyClass
 
-  function TypeTests$EmptyClass() {
+  function EmptyClass() {
   }
-  var TypeTests$EmptyClass$ = {
+  var EmptyClass$ = {
 
   };
 
 
   // TypeTests.SingleMemberClass
 
-  function TypeTests$SingleMemberClass() {
+  function SingleMemberClass() {
   }
-  var TypeTests$SingleMemberClass$ = {
+  var SingleMemberClass$ = {
     run: function() {
     }
   };
@@ -29,10 +29,10 @@ define('test', ['ss'], function(ss) {
 
   // TypeTests.MergedMembersClass
 
-  function TypeTests$MergedMembersClass() {
+  function MergedMembersClass() {
     this.foo = false;
   }
-  var TypeTests$MergedMembersClass$ = {
+  var MergedMembersClass$ = {
     testMethod: function() {
       return null;
     }
@@ -41,9 +41,9 @@ define('test', ['ss'], function(ss) {
 
   // TypeTests.MyClass
 
-  function TypeTests$MyClass() {
+  function MyClass() {
   }
-  var TypeTests$MyClass$ = {
+  var MyClass$ = {
     start: function() {
     },
     Stop: function() {
@@ -55,9 +55,9 @@ define('test', ['ss'], function(ss) {
 
   // TypeTests.SomeClass
 
-  function TypeTests$SomeClass() {
+  function SomeClass() {
   }
-  var TypeTests$SomeClass$ = {
+  var SomeClass$ = {
     close: function() {
     },
     _cancel: function() {
@@ -69,7 +69,7 @@ define('test', ['ss'], function(ss) {
 
   // TypeTests.App
 
-  function TypeTests$App() {
+  function App() {
     var s;
     s.run();
     var d;
@@ -80,28 +80,28 @@ define('test', ['ss'], function(ss) {
     mc.Stop();
     mc.resume();
   }
-  var TypeTests$App$ = {
+  var App$ = {
 
   };
 
 
   // TypeTests.DerivedMemberClass
 
-  function TypeTests$DerivedMemberClass() {
-    TypeTests$SingleMemberClass.call(this);
+  function DerivedMemberClass() {
+    SingleMemberClass.call(this);
   }
-  var TypeTests$DerivedMemberClass$ = {
+  var DerivedMemberClass$ = {
 
   };
 
 
   // TypeTests.DerivedMergedMembersClass
 
-  function TypeTests$DerivedMergedMembersClass() {
-    TypeTests$MergedMembersClass.call(this);
+  function DerivedMergedMembersClass() {
+    MergedMembersClass.call(this);
     this.name = this.bar + this.bar + 'Name';
   }
-  var TypeTests$DerivedMergedMembersClass$ = {
+  var DerivedMergedMembersClass$ = {
     testMethod: function() {
       return null;
     },
@@ -112,7 +112,7 @@ define('test', ['ss'], function(ss) {
       var e1 = document.getElementById(this.bar);
       var e2 = document.getElementById(this.name);
       var e3 = document.getElementById(this.bar);
-      var s = this.testMethod() + ss.base(this, 'testMethod').call(this);
+      var s = this.testMethod() + MergedMembersClass.prototype.testMethod.call(this);
     },
     get_item: function(s) {
       return s;
@@ -122,17 +122,17 @@ define('test', ['ss'], function(ss) {
 
   var $exports = ss.module('test',
     {
-      SingleMemberClass: [ TypeTests$SingleMemberClass, TypeTests$SingleMemberClass$, null ],
-      SomeClass: [ TypeTests$SomeClass, TypeTests$SomeClass$, null ]
+      SingleMemberClass: [ SingleMemberClass, SingleMemberClass$, null ],
+      SomeClass: [ SomeClass, SomeClass$, null ]
     },
     {
-      IMyInterface: [ TypeTests$IMyInterface ],
-      EmptyClass: [ TypeTests$EmptyClass, TypeTests$EmptyClass$, null ],
-      MergedMembersClass: [ TypeTests$MergedMembersClass, TypeTests$MergedMembersClass$, null ],
-      MyClass: [ TypeTests$MyClass, TypeTests$MyClass$, null, TypeTests$IMyInterface ],
-      App: [ TypeTests$App, TypeTests$App$, null ],
-      DerivedMemberClass: [ TypeTests$DerivedMemberClass, TypeTests$DerivedMemberClass$, TypeTests$SingleMemberClass ],
-      DerivedMergedMembersClass: [ TypeTests$DerivedMergedMembersClass, TypeTests$DerivedMergedMembersClass$, TypeTests$MergedMembersClass ]
+      IMyInterface: [ IMyInterface ],
+      EmptyClass: [ EmptyClass, EmptyClass$, null ],
+      MergedMembersClass: [ MergedMembersClass, MergedMembersClass$, null ],
+      MyClass: [ MyClass, MyClass$, null, IMyInterface ],
+      App: [ App, App$, null ],
+      DerivedMemberClass: [ DerivedMemberClass, DerivedMemberClass$, SingleMemberClass ],
+      DerivedMergedMembersClass: [ DerivedMergedMembersClass, DerivedMergedMembersClass$, MergedMembersClass ]
     });
 
 
diff --git a/tests/TestCases/Type/Records/Baseline.txt b/tests/TestCases/Type/Records/Baseline.txt
index 97af8a9bc..102a2ba16 100644
--- a/tests/TestCases/Type/Records/Baseline.txt
+++ b/tests/TestCases/Type/Records/Baseline.txt
@@ -5,7 +5,7 @@ define('test', ['ss'], function(ss) {
 
   // TypeTests.Point
 
-  function TypeTests$Point(x, y) {
+  function Point(x, y) {
     var $o = {};
     $o.x = x;
     $o.y = y;
@@ -15,13 +15,13 @@ define('test', ['ss'], function(ss) {
 
   // TypeTests.Pair
 
-  function TypeTests$Pair() { return {}; }
+  function Pair() { return {}; }
 
 
   var $exports = ss.module('test', null,
     {
-      Point: TypeTests$Point,
-      Pair: TypeTests$Pair
+      Point: Point,
+      Pair: Pair
     });
 
 
diff --git a/tests/TestCases/Type/UsingAlias/Baseline.txt b/tests/TestCases/Type/UsingAlias/Baseline.txt
index cc42a864f..4ad21c1b2 100644
--- a/tests/TestCases/Type/UsingAlias/Baseline.txt
+++ b/tests/TestCases/Type/UsingAlias/Baseline.txt
@@ -5,19 +5,19 @@ define('test', ['ss'], function(ss) {
 
   // TypeTests.MyClass
 
-  function TypeTests$MyClass() {
+  function MyClass() {
     var body = document.body;
     var head = document.getElementsByTagName('head')[0];
     head.appendChild(body);
   }
-  var TypeTests$MyClass$ = {
+  var MyClass$ = {
 
   };
 
 
   var $exports = ss.module('test', null,
     {
-      MyClass: [ TypeTests$MyClass, TypeTests$MyClass$, null ]
+      MyClass: [ MyClass, MyClass$, null ]
     });
 
 
diff --git a/tests/TestCases/Validation/InlineScript/Code.cs b/tests/TestCases/Validation/InlineScript/Code.cs
index 28de5655f..5ee3257a6 100644
--- a/tests/TestCases/Validation/InlineScript/Code.cs
+++ b/tests/TestCases/Validation/InlineScript/Code.cs
@@ -13,6 +13,7 @@ public void Test(int arg) {
             string scriptTemplate = "alert({0} + {1})";
             
             Script.Literal(scriptTemplate, a, a);
+            Script.Literal("alert({name:{0}})", "aaa");
         }
     }
 }
diff --git a/tests/TestSite/Bases.htm b/tests/TestSite/Bases.htm
new file mode 100644
index 000000000..a90ed09b5
--- /dev/null
+++ b/tests/TestSite/Bases.htm
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Bases</title>
+  <link rel="stylesheet" href="QUnit/QUnit.css" type="text/css" />
+  <script type="text/javascript" src="QUnit/QUnit.js"></script>
+  <script type="text/javascript" src="QUnit/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="Scripts/ssloader.min.js"></script>
+<script type="text/script" data-name="ss" data-src="Scripts/ss.min.js"></script>
+<script type="text/script" data-name="oop" data-src="Scripts/OOP.js"></script>
+
+<script type="text/script">
+define(['ss', 'oop'], function(ss, oop) {
+  module('OOP');
+
+  test('bases', function() {
+    var output1 = oop.TestCase.runTest(new oop.C1());
+    QUnit.equal(output1, "A-PC1,A-MC1,A-99IC1,X+PC1-PC1,Y+88IC1-99IC1", "Code path through base classes problem (C1)");
+
+    var output2 = oop.TestCase.runTest(new oop.C2());
+    QUnit.equal(output2, "A-PC1-PC2,A-MC1-MC2,A-99IC1-99IC2,X+PC2+PC1-PC1-PC2,Y+88IC2+88IC1-99IC1-99IC2", "Code path through base classes problem (C2)");
+
+    var output3 = oop.TestCase.runTest(new oop.C3());
+    QUnit.equal(output3, "A-PC1-PC2-PC3,A-MC1-MC2-MC3,A-99IC1-99IC2-99IC3,X+PC3+PC2+PC1-PC1-PC2-PC3,Y+88IC3+88IC2+88IC1-99IC1-99IC2-99IC3", "Code path through base classes problem (C3)");
+
+    // A C4 should act just like a C3 as it has no overrides
+    var output4 = oop.TestCase.runTest(new oop.C4());
+    QUnit.equal(output4, "A-PC1-PC2-PC3,A-MC1-MC2-MC3,A-99IC1-99IC2-99IC3,X+PC3+PC2+PC1-PC1-PC2-PC3,Y+88IC3+88IC2+88IC1-99IC1-99IC2-99IC3", "Code path through base classes problem (C4)");
+
+    var output5 = oop.TestCase.runTest(new oop.C5());
+    QUnit.equal(output5, "A-PC1-PC2-PC3-PC5,A-MC1-MC2-MC3-MC5,A-99IC1-99IC2-99IC3-99IC5,X+PC5+PC3+PC2+PC1-PC1-PC2-PC3-PC5,Y+88IC5+88IC3+88IC2+88IC1-99IC1-99IC2-99IC3-99IC5", "Code path through base classes problem (C5)");
+  });
+});
+</script>
+</html>
diff --git a/tests/TestSite/Code/OOP.cs b/tests/TestSite/Code/OOP.cs
index 1b5d7b415..7891e84ef 100644
--- a/tests/TestSite/Code/OOP.cs
+++ b/tests/TestSite/Code/OOP.cs
@@ -121,3 +121,140 @@ public interface IObject {
     public class Zoo {
     }
 }
+
+
+namespace Test.Bases {
+
+    // A series of classes with different combinations of overrides at different
+    // levels in the class hierarchy. Tests issues #379, #384 as applied to properties,
+    // methods, and index operators.
+
+    public class C1 {
+        private string _valueA = "A";
+
+        public virtual string PropertyA {
+            get {
+                return _valueA + "-PC1";
+            }
+            set {
+                _valueA = value + "+PC1";
+            }
+        }
+
+        public virtual string MethodA() {
+            return _valueA + "-MC1";
+        }
+
+        public virtual string this[int key] {
+            get {
+                return _valueA + "-" + key.ToString() + "IC1";
+            }
+            set {
+                _valueA = value + "+" + key.ToString() + "IC1";
+            }
+        }
+    }
+
+    public class C2 : C1 {
+        public override string PropertyA {
+            get {
+                return base.PropertyA + "-PC2";
+            }
+            set {
+                base.PropertyA = value + "+PC2";
+            }
+        }
+
+        public override string MethodA() {
+            return base.MethodA() + "-MC2";
+        }
+
+        public override string this[int key] {
+            get {
+                return base[key] + "-" + key.ToString() + "IC2";
+            }
+            set {
+                base[key] = value + "+" + key.ToString() + "IC2";
+            }
+        }
+    }
+
+    public class C3 : C2 {
+        public override string PropertyA {
+            get {
+                return base.PropertyA + "-PC3";
+            }
+            set {
+                base.PropertyA = value + "+PC3";
+            }
+        }
+
+        public override string MethodA() {
+            return base.MethodA() + "-MC3";
+        }
+
+        public override string this[int key] {
+            get {
+                return base[key] + "-" + key.ToString() + "IC3";
+            }
+            set {
+                base[key] = value + "+" + key.ToString() + "IC3";
+            }
+        }
+    }
+
+    public class C4 : C3 {
+        // intentionally skip this generation of overrides
+    }
+
+    public class C5 : C4 {
+        public override string PropertyA {
+            get {
+                return base.PropertyA + "-PC5";
+            }
+            set {
+                base.PropertyA = value + "+PC5";
+            }
+        }
+
+        public override string MethodA() {
+            return base.MethodA() + "-MC5";
+        }
+
+        public override string this[int key] {
+            get {
+                return base[key] + "-" + key.ToString() + "IC5";
+            }
+            set {
+                base[key] = value + "+" + key.ToString() + "IC5";
+            }
+        }
+    }
+
+    public class TestCase {
+
+        public static string RunTest(C1 x) {
+            string output = "";
+            string delim = ",";
+
+            // Test getter, method, and index (should accumulate outward through bases)
+            output = x.PropertyA
+                    + delim + x.MethodA()
+                    + delim + x[99];
+
+            // Test property setter (should accumulate inward and outward through bases)
+
+            x.PropertyA = "X";
+            output += delim + x.PropertyA;
+
+            // Test index setter (should accumulate inward and outward through bases)
+
+            x[88] = "Y";
+            output += delim + x[99];
+
+            return output;
+        }
+
+    }
+
+}
diff --git a/tests/TestSite/String.htm b/tests/TestSite/String.htm
index dc0422059..7adba8c55 100644
--- a/tests/TestSite/String.htm
+++ b/tests/TestSite/String.htm
@@ -22,11 +22,32 @@ <h2 id="qunit-userAgent"></h2>
   test('trim', function() {
     QUnit.equal(ss.trimStart('Hello'), 'Hello');
     QUnit.equal(ss.trimStart('  Hello'), 'Hello');
-    QUnit.equal(ss.trimEnd('  Hello'), '  Hello');
+    QUnit.equal(ss.trimStart(' Hello  '), 'Hello  ');
+
+    QUnit.equal(ss.trimEnd('Hello'), 'Hello');
     QUnit.equal(ss.trimEnd('Hello  '), 'Hello');
-    QUnit.equal(ss.trimStart('Hello'), 'Hello');
+    QUnit.equal(ss.trimEnd(' Hello  '), ' Hello');
+
     QUnit.equal(ss.trimEnd(ss.trimStart('  Hello  ')), 'Hello');
     QUnit.equal(ss.trimEnd(ss.trimStart('\tHello  ')), 'Hello');
+ 
+    QUnit.equal(ss.trim('Hello'), 'Hello');
+    QUnit.equal(ss.trim('  Hello  '), 'Hello');
+    QUnit.equal(ss.trim('\tHello  '), 'Hello');
+    QUnit.equal(ss.trim('\t Hello  World '), 'Hello  World');
+
+    QUnit.equal(ss.trimStart('00word00', ['0']), 'word00');
+    QUnit.equal(ss.trimStart('10word01', ['0', '1']), 'word01');
+    QUnit.equal(ss.trimStart('10 0word0 01', ['0', '1']), ' 0word0 01');
+
+    QUnit.equal(ss.trimEnd('00word00', ['0']), '00word');
+    QUnit.equal(ss.trimEnd('10word01', ['0', '1']), '10word');
+    QUnit.equal(ss.trimEnd('10 0word0 01', ['0', '1']), '10 0word0 ');
+
+    QUnit.equal(ss.trim('00word00', ['0']), 'word');
+    QUnit.equal(ss.trim('10word01', ['0', '1']), 'word');
+    QUnit.equal(ss.trim('10 0word0 01', ['0', '1']), ' 0word0 ');
+    QUnit.equal(ss.trim(' word ', []), 'word');
   });
 
   test('padLeft', function() {
diff --git a/tests/ValidationTests.cs b/tests/ValidationTests.cs
index ff598d290..1d608b69e 100644
--- a/tests/ValidationTests.cs
+++ b/tests/ValidationTests.cs
@@ -114,7 +114,8 @@ public void TestImplicitEnums() {
         [TestMethod]
         public void TestInlineScript() {
             string expectedErrors =
-                "The argument to Script.Literal must be a constant string. Code.cs(15, 28)";
+                "The argument to Script.Literal must be a constant string. Code.cs(15, 28)" + Environment.NewLine +
+                "The argument to Script.Literal must be a valid String.Format string. Code.cs(16, 28)";
 
             Compilation compilation = CreateCompilation();
             compilation.AddSource("Code.cs");